Persist global marks on disk

Fixes VSCodeVim#3841
EerikSaksi · Aug 28, 2023 · 870e952 · 870e952
1 parent 6b667ec
commit 870e952
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/extensionBase.ts b/extensionBase.ts
@@ -16,6 +16,7 @@ import { globalState } from './src/state/globalState';
 import { Register } from './src/register/register';
 import { SpecialKeys } from './src/util/specialKeys';
 import { exCommandParser } from './src/vimscript/exCommandParser';
+import { HistoryStep } from './src/history/historyTracker';
 
 let extensionContext: vscode.ExtensionContext;
 let previousActiveEditorUri: vscode.Uri | undefined;
@@ -107,7 +108,7 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
 
   // Load state
   Register.loadFromDisk(handleLocal);
-  await Promise.all([ExCommandLine.loadHistory(context), SearchCommandLine.loadHistory(context)]);
+  await Promise.all([ExCommandLine.loadHistory(context), SearchCommandLine.loadHistory(context), HistoryStep.loadHistory(context)]);
 
   if (vscode.window.activeTextEditor) {
     const filepathComponents = vscode.window.activeTextEditor.document.fileName.split(/\\|\//);

diff --git a/src/history/historyFile.ts b/src/history/historyFile.ts
@@ -43,3 +43,9 @@ export class CommandLineHistory extends HistoryFile {
     super(context, '.cmdline_history');
   }
 }
+
+export class MarkHistory extends HistoryFile {
+  constructor(context: ExtensionContext) {
+    super(context, '.mark_history');
+  }
+}
diff --git a/src/history/historyTracker.ts b/src/history/historyTracker.ts
@@ -22,6 +22,8 @@ import { Mode } from '../mode/mode';
 import { ErrorCode, VimError } from '../error';
 import { Logger } from '../util/logger';
 import { earlierOf } from '../common/motion/position';
+import { MarkHistory } from './historyFile';
+import { ExtensionContext } from 'vscode';
 
 const diffEngine = new DiffMatchPatch.diff_match_patch();
 diffEngine.Diff_Timeout = 1; // 1 second
@@ -106,7 +108,7 @@ export interface IMark {
 /**
  * An undo's worth of changes; generally corresponds to a single action.
  */
-class HistoryStep {
+export class HistoryStep {
   /**
    * The insertions and deletions that occured in this history step.
    */
@@ -145,6 +147,23 @@ class HistoryStep {
    */
   static globalMarks: IMark[] = [];
 
+  public static markHistory: MarkHistory;
+
+  public static async loadHistory(context: ExtensionContext): Promise<void> {
+    HistoryStep.markHistory = new MarkHistory(context);
+    await HistoryStep.markHistory.load();
+    HistoryStep.markHistory.get().forEach((row) => {
+      const parsed = JSON.parse(row);
+			const newMark : IMark = {
+				position: parsed.position,
+				name: parsed.name,
+				isUppercaseMark: true,
+				document: parsed.document
+			};
+      HistoryStep.globalMarks.push(newMark);
+    });
+  }
+
   constructor(init: { marks: IMark[]; changes?: DocumentChange[]; cameFromU?: boolean }) {
     this.changes = init.changes ?? [];
     this.marks = init.marks ?? [];
@@ -552,6 +571,9 @@ export class HistoryTracker {
       marks[previousIndex] = mark;
     } else {
       marks.push(mark);
+    }
+		if (mark.isUppercaseMark) {
+      HistoryStep.markHistory.add(JSON.stringify(mark));
     }
   }