Persist and restore code folds

packages/insomnia-app/app/ui/components/codemirror/code-editor.js

@@ -231,12 +231,21 @@ class CodeEditor extends React.Component {
     if (!uniquenessKey || !this.codeMirror) {
       return;
     }
+    const marks = this.codeMirror
+      .getAllMarks()
+      .filter(c => c.__isFold)
+      .map(mark => {
+        const { from, to } = mark.find();
+
+        return { from, to };
+      });
 
     editorStates[uniquenessKey] = {
       scroll: this.codeMirror.getScrollInfo(),
       selections: this.codeMirror.listSelections(),
       cursor: this.codeMirror.getCursor(),
       history: this.codeMirror.getHistory(),
+      marks,
     };
   }
 
@@ -246,13 +255,18 @@ class CodeEditor extends React.Component {
       return;
     }
 
-    const { scroll, selections, cursor, history } = editorStates[uniquenessKey];
+    const { scroll, selections, cursor, history, marks } = editorStates[uniquenessKey];
     this.codeMirror.scrollTo(scroll.left, scroll.top);
     this.codeMirror.setHistory(history);
 
     // NOTE: These won't be visible unless the editor is focused
     this.codeMirror.setCursor(cursor.line, cursor.ch, { scroll: false });
     this.codeMirror.setSelections(selections, null, { scroll: false });
+
+    marks &&
+      marks.forEach(({ from, to }) => {
+        this.codeMirror.foldCode(from, to);
+      });
   }
 
   _setFilterInputRef(n) {
@@ -284,6 +298,8 @@ class CodeEditor extends React.Component {
     this.codeMirror.on('blur', this._codemirrorBlur);
     this.codeMirror.on('paste', this._codemirrorPaste);
     this.codeMirror.on('scroll', this._codemirrorScroll);
+    this.codeMirror.on('fold', this._codemirrorToggleFold);
+    this.codeMirror.on('unfold', this._codemirrorToggleFold);
     this.codeMirror.on('keyHandled', this._codemirrorKeyHandled);
 
     // Prevent these things if we're type === "password"
@@ -695,6 +711,10 @@ class CodeEditor extends React.Component {
     this._persistState();
   }
 
+  _codemirrorToggleFold() {
+    this._persistState();
+  }
+
   _codemirrorKeyHandled(codeMirror, keyName, event) {
     const { keyMap } = this.props;
     const { keyCode } = event;

packages/insomnia-app/flow-typed/codemirror.js

@@ -2,7 +2,9 @@
 
 declare module 'codemirror' {
   declare class TextMarker {
+    __isFold: boolean;
     clear(): void;
+    find(): { from: Pos, to: Pos };
   }
   declare class Doc {
     markText(
@@ -28,5 +30,6 @@ declare module 'codemirror' {
     setValue(string): void;
     hasFocus(): boolean;
     indexFromPos(pos: Pos): number;
+    getAllMarks(): Array<TextMarker>;
   }
 }