Merge pull request #11584 from thehogfather/code-folding-unit-tests

Code folding unit tests

Author: abose

src/extensions/default/CodeFolding/foldhelpers/foldcode.js

@@ -90,8 +90,8 @@ define(function (require, exports, module) {
         });
 
         textRange.on("clear", function (from, to) {
-            delete cm._lineFolds[from.line];
-            CodeMirror.signal(cm, "unfold", cm, from, to);
+            delete cm._lineFolds[pos.line];
+            CodeMirror.signal(cm, "unfold", cm, from, to, pos.line);
         });
 
         if (force === "fold") {
@@ -101,7 +101,7 @@ define(function (require, exports, module) {
             delete cm._lineFolds[pos.line];
         }
 
-        CodeMirror.signal(cm, force, cm, range.from, range.to);
+        CodeMirror.signal(cm, force, cm, range.from, range.to, pos.line);
         return range;
     }
 

src/extensions/default/CodeFolding/foldhelpers/foldgutter.js

@@ -355,19 +355,30 @@ define(function (require, exports, module) {
       * @param {!CodeMirror} cm the CodeMirror instance for the active editor
       * @param {!Object} from  the ch and line position that designates the start of the region
       * @param {!Object} to the ch and line position that designates the end of the region
+      * @param {?Number} gutterLineNumber the gutter line number that was clicked to signal the fold event
       */
-    function onFold(cm, from, to) {
-        updateFoldInfo(cm, from.line, from.line + 1);
+    function onFold(cm, from, to, gutterLineNumber) {
+        var state = cm.state.foldGutter,
+            line = isNaN(gutterLineNumber) ? from.line : gutterLineNumber;
+        if (line >= state.from && line < state.to) {
+            updateFoldInfo(cm, line, line + 1);
+        }
     }
 
     /**
       * Triggered when a folded code segment is unfolded.
       * @param {!CodeMirror} cm the CodeMirror instance for the active editor
       * @param {!{line:number, ch:number}} from  the ch and line position that designates the start of the region
       * @param {!{line:number, ch:number}} to the ch and line position that designates the end of the region
+      * @param {?Number} gutterLineNumber the gutter line number that was clicked to signal the fold event
       */
-    function onUnFold(cm, from, to) {
-        updateFoldInfo(cm, from.line, from.line + 1);
+    function onUnFold(cm, from, to, gutterLineNumber) {
+        var state = cm.state.foldGutter,
+            line = isNaN(gutterLineNumber) ? from.line : gutterLineNumber;
+        var vp = cm.getViewport();
+        if (line >= state.from && line < state.to) {
+            updateFoldInfo(cm, line, Math.min(vp.to, to.line));
+        }
     }
 
     /**

src/extensions/default/CodeFolding/unittest-files/test.js

@@ -0,0 +1,33 @@
+/**
+     * Synchronises the code folding states in the CM doc to cm._lineFolds cache.
+     * When an undo operation is done, if folded code fragments are restored, then
+     * we need to update cm._lineFolds with the fragments
+     * @param {Object}   cm       cm the CodeMirror instance for the active  editor
+     * @param {Object}   from     starting position in the doc to sync the fold states from
+     * @param {[[Type]]} lineAdded a number to show how many lines where added to the document
+     */
+    function syncDocToFoldsCache(cm, from, lineAdded) {
+        var minFoldSize = prefs.getSetting("minFoldSize") || 2;
+        var opts = cm.state.foldGutter.options || {};
+        var rf = opts.rangeFinder || CodeMirror.fold.auto;
+        var i, pos, folds, fold, range;
+        if (lineAdded <= 0) {
+            return;
+        }
+
+        for (i = from; i <= from + lineAdded; i = i + 1) {
+            pos = CodeMirror.Pos(i);
+            folds = cm.doc.findMarksAt(pos).filter(isFold);
+            fold = folds.length ? fold = folds[0] : undefined;
+            if (fold) {
+                range = rf(cm, CodeMirror.Pos(i));
+                if (range && range.to.line - range.from.line >= minFoldSize) {
+                    cm._lineFolds[i] = range;
+                    i = range.to.line;
+                } else {
+                    delete cm._lineFolds[i];
+                }
+            }
+        }
+
+    }