[comment-fold addon] Implement

addon/fold/comment-fold.js

@@ -0,0 +1,44 @@
+CodeMirror.registerHelper("fold", "comment", function(cm, start) {
+  var mode = cm.getMode(), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
+  if (!startToken || !endToken) return;
+  var line = start.line, lineText = cm.getLine(line);
+  var startCh, tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+      if (/^(comment)/.test(tokenType)) return found + 1;
+      at = found - 1;
+    }
+  }
+
+  var startCh = findOpening(startToken);
+  if (startCh == null) return;
+  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
+        if (pos == nextOpen) ++count;
+        else if (!--count) { end = i; endCh = pos; break outer; }
+      }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});

demo/folding.html

@@ -10,6 +10,7 @@
 <script src="../addon/fold/foldgutter.js"></script>
 <script src="../addon/fold/brace-fold.js"></script>
 <script src="../addon/fold/xml-fold.js"></script>
+<script src="../addon/fold/comment-fold.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
@@ -55,7 +56,10 @@ <h2>Code Folding Demo</h2>
       <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
       <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
     </form>
-    <script id="script">
+    <script id="script"> 
+/*
+ * Demonstration of code folding
+ */
 window.onload = function() {
   var te = document.getElementById("code");
   var sc = document.getElementById("script");
@@ -69,7 +73,9 @@ <h2>Code Folding Demo</h2>
     lineNumbers: true,
     lineWrapping: true,
     extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
-    foldGutter: true,
+    foldGutter: {
+    	rangeFinder: new CodeMirror.fold.combine(CodeMirror.fold.brace, CodeMirror.fold.comment)
+    },    
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
   editor.foldCode(CodeMirror.Pos(8, 0));

mode/xquery/xquery.js

@@ -442,7 +442,11 @@ CodeMirror.defineMode("xquery", function() {
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
       return style;
-    }
+    },
+
+    blockCommentStart: "(:",
+    blockCommentEnd: ":)"
+
   };
 
 });