Fixed folding while moving #62

vslinko · Apr 10, 2021 · 9f9c591 · 9f9c591
1 parent e9c539b
commit 9f9c591
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/src/list_utils.ts b/src/list_utils.ts
@@ -75,6 +75,10 @@ export class ListUtils {
         line,
         indentSign
       );
+      const folded = (editor as any).isFolded({
+        line: l,
+        ch: 0,
+      });
 
       if (indentLevel === currentLevel.getLevel() + 1) {
         currentLevel = lastList;
@@ -87,7 +91,7 @@ export class ListUtils {
         return null;
       }
 
-      const list = new List(indentSign, bullet, content);
+      const list = new List(indentSign, bullet, content, folded);
       currentLevel.addAfterAll(list);
       lastList = list;
     }
@@ -102,6 +106,13 @@ export class ListUtils {
     );
     const newString = root.print();
 
+    const fromLine = root.getListStartPosition().line;
+    const toLine = root.getListEndPosition().line;
+
+    for (let l = fromLine; l <= toLine; l++) {
+      (editor as any).foldCode(l, null, "unfold");
+    }
+
     const diff = diffLines(oldString, newString);
     let l = root.getListStartPosition().line;
     for (const change of diff) {
@@ -128,6 +139,14 @@ export class ListUtils {
     if (oldCursor.line != newCursor.line || oldCursor.ch != newCursor.ch) {
       editor.setCursor(newCursor);
     }
+
+    for (let l = fromLine; l <= toLine; l++) {
+      const line = root.getListUnderLine(l);
+      if (line.isFoldRoot()) {
+        // TODO: why working only with -1?
+        (editor as any).foldCode(l - 1);
+      }
+    }
   }
 
   detectListIndentSign(editor: CodeMirror.Editor, cursor: CodeMirror.Position) {

diff --git a/src/root.ts b/src/root.ts
@@ -8,17 +8,40 @@ export class List implements IList {
   private indentSign: string;
   private bullet: string;
   private content: string;
+  private folded: boolean;
   private children: List[];
   private parent: List;
 
-  constructor(indentSign: string, bullet: string, content: string) {
+  constructor(
+    indentSign: string,
+    bullet: string,
+    content: string,
+    folded: boolean
+  ) {
     this.indentSign = indentSign;
     this.bullet = bullet;
     this.content = content;
+    this.folded = folded;
     this.children = [];
     this.parent = null;
   }
 
+  isFolded() {
+    return this.folded;
+  }
+
+  isFoldRoot() {
+    let parent = this.getParent();
+    while (parent) {
+      if (parent.isFolded()) {
+        return false;
+      }
+      parent = parent.getParent();
+    }
+
+    return this.isFolded();
+  }
+
   getChildren() {
     return this.children.concat();
   }
@@ -133,7 +156,7 @@ export class Root implements IList {
     this.start = start;
     this.end = end;
     this.cursor = cursor;
-    this.rootList = new List("", "", "");
+    this.rootList = new List("", "", "", false);
   }
 
   replaceCursor(cursor: CodeMirror.Position) {