From 7d7345b9ec92480459fa540d3fee400af7071813 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <ian@isinglasstheater.org>
Date: Mon, 30 Jun 2014 22:27:39 -0700
Subject: [PATCH] Hide comments.

---
 grammars/mediawiki.js |  8 ++++----
 recentrunes.js        | 46 +++++++++++++++++++++++++++++++++++++++++++
 test.js               |  3 +--
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/grammars/mediawiki.js b/grammars/mediawiki.js
index 4b06487..2a97d36 100644
--- a/grammars/mediawiki.js
+++ b/grammars/mediawiki.js
@@ -121,7 +121,7 @@ var mediawiki = {
       rr.Literal('<code>'),
       rr.Ref('multiline-wikichunk'),
       rr.Literal('</code>'))),
-  'multiline-comment': rr.Node('comment', rr.Sequence(
+  'multiline-comment': rr.Hidden(rr.Sequence(
       rr.Literal('<!-- '),
       rr.MultiLineText(),
       rr.Literal(' -->'))),
@@ -185,7 +185,7 @@ var mediawiki = {
       rr.Literal('<code>'),
       rr.Ref('singleline-wikichunk'),
       rr.Literal('</code>'))),
-  'singleline-comment': rr.Node('comment', rr.Sequence(
+  'singleline-comment': rr.Hidden(rr.Sequence(
       rr.Literal('<!-- '),
       rr.SingleLineText(),
       rr.Literal(' -->'))),
@@ -287,8 +287,8 @@ var mediawiki = {
   'paragraph': rr.Node('p', rr.Sequence(
       rr.Ref('multiline-wikichunk'),
       rr.Or(
-        rr.Sequence(rr.EndOfLine(), rr.Literal('\n')),
-        rr.EndOfText()))),
+          rr.Sequence(rr.EndOfLine(), rr.Literal('\n')),
+          rr.EndOfText()))),
 
   'wikidoc': rr.Node('wikidoc', rr.Sequence(
       rr.ZeroOrMore(rr.Ref('paragraph')),
diff --git a/recentrunes.js b/recentrunes.js
index 6f3496b..8885d00 100644
--- a/recentrunes.js
+++ b/recentrunes.js
@@ -180,6 +180,7 @@ rr.EndOfText = function() {
     /**
      * @type {rr.EndOfText_}
      * @const
+     * @private
      */
     rr.EndOfText.cache_ = new rr.EndOfText_();
   }
@@ -188,6 +189,51 @@ rr.EndOfText = function() {
 
 
 
+/**
+ * @constructor
+ *
+ * @param {rr.typeMatcher} child
+ * @private
+ */
+rr.Hidden_ = function(child) {
+  this.child_ = child;
+};
+
+
+/**
+ * @param {rr.Context} context
+ * @return {rr.typeIterator}
+ */
+rr.Hidden_.prototype.match = function(context) {
+  var iterator = this.child_.match(context);
+  return {
+    'next': function() {
+      var next = iterator.next();
+      if (next['done']) {
+        return { 'done': true };
+      }
+      return {
+        'done': false,
+        'value': {
+          'context': next['value']['context'],
+          'nodes': []
+        }
+      };
+    }.bind(this)
+  };
+};
+
+
+/**
+ * @param {rr.typeMatcher} child
+ * @return {rr.Hidden_}
+ */
+rr.Hidden = function(child) {
+  return new rr.Hidden_(child);
+};
+
+
+
 /**
  * @constructor
  *
diff --git a/test.js b/test.js
index beb76e1..ac7562a 100644
--- a/test.js
+++ b/test.js
@@ -46,8 +46,7 @@ QUnit.test('Base', function(assert) {
     '<tt>this</tt>. <pre>This sentence is inline pre-formatted, which stops \n',
     "'''''this from being bold and italic.'''''</pre> We can also \nstop ",
     '&lt;u&gt;this from being underlined&lt;/u&gt;, or just try \n',
-    '&lt;pre&gt;interrupting cow style.&lt;/pre&gt;<comment>This is a ',
-    "comment and \nshouldn't be visible</comment><blockquote>This is a ",
+    '&lt;pre&gt;interrupting cow style.&lt;/pre&gt;<blockquote>This is a ',
     'blockquote</blockquote></p><p><h2>Header 2</h2><h3>Header 3 <i>with ',
     'italics</i></h3><h4>Header 4</h4><h5>Header 5</h5><h6>Header 6</h6><hr>',
     '<ulli1>Item 1a</ulli1><ulli1>Item 1b</ulli1><ulli2>Item 2</ulli2><ulli3>',