Merge pull request #1398 from casperdcl/master

add multi-line block comment folding

Author: jcb91

src/jupyter_contrib_nbextensions/nbextensions/codefolding/blockcomment-fold.js

@@ -0,0 +1,31 @@
+/* allow folding of multi-line comments */
+CodeMirror.registerHelper("fold", "blockcomment", function(cm, start) {
+  var mode = cm.getMode(), Token = mode.lineComment;
+  var lineText = cm.getLine(start.line);
+  var found = lineText.lastIndexOf(Token,0);
+  if (found == 0) {  // current line is a comment
+    if (start.line == 0) {
+      found = -1;
+    } else {
+      lineText = cm.getLine(start.line - 1);
+      found = lineText.lastIndexOf(Token,0);
+    }
+    if (start.line == 0 || found != 0) {  // no previous comment line
+      end = start.line;
+      for (var i=start.line + 1; i<=cm.lastLine(); ++i) {  // final comment line
+        lineText = cm.getLine(i);
+        found = lineText.lastIndexOf(Token,0);
+        if (found == 0) {
+          end = i;
+        } else {
+          break;
+        }
+      }
+      if(end > start.line) {
+        return {from: CodeMirror.Pos(start.line, null),
+                to: CodeMirror.Pos(end, null)};
+      }
+    }
+  }
+return ;
+});

src/jupyter_contrib_nbextensions/nbextensions/codefolding/magic-fold.js

@@ -5,10 +5,10 @@ CodeMirror.registerHelper("fold", "magic", function(cm, start) {
       var lineText = cm.getLine(start.line);
       var found = lineText.lastIndexOf(Token,0);
       if (found == 0) {
-        end =  cm.lastLine(); 
+        end =  cm.lastLine();
         return {from: CodeMirror.Pos(start.line, null),
-              to: CodeMirror.Pos(end, null)}; 
+              to: CodeMirror.Pos(end, null)};
         }
     }
-    return ;  
+    return ;
 });

src/jupyter_contrib_nbextensions/nbextensions/codefolding/main.js

@@ -140,6 +140,7 @@ define([
                 rangeFinder: new CodeMirror.fold.combine(
                     CodeMirror.fold.firstline,
                     CodeMirror.fold.magic,
+                    CodeMirror.fold.blockcomment,
                     cm.getMode().fold === 'indent' ? CodeMirror.fold.indent : CodeMirror.fold.brace
                 )
             };
@@ -256,7 +257,7 @@ define([
 
         if (Jupyter.notebook) {
             /* require our additional custom codefolding modes before initialising fully */
-            requirejs(['./firstline-fold', './magic-fold'], function () {
+            requirejs(['./firstline-fold', './magic-fold', './blockcomment-fold'], function () {
                 if (Jupyter.notebook._fully_loaded) {
                     setTimeout(function () {
                         console.log('Codefolding: Wait for', params.init_delay, 'ms');