Activate optimization from VSCodeVim#4451 when `experimentalOptimizat…

…ions` is enabled
cvaldev · Jan 4, 2020 · 8eea11b · 8eea11b
1 parent 8bad868
commit 8eea11b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/history/historyTracker.ts b/src/history/historyTracker.ts
@@ -462,7 +462,7 @@ export class HistoryTracker {
    */
   public addChange(cursorPosition = [new Position(0, 0)]): boolean {
     if (configuration.experimentalOptimizations && !this._isDocumentTextNeeeded()) {
-      return;
+      return false;
     }
     const newText = this._getDocumentText();
 

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -599,16 +599,17 @@ export class ModeHandler implements vscode.Disposable {
       // we'll grab the text of the incorrect active window and assume the
       // whole document changed!
 
+      const mightChangeDocument = recordedState.hasRunOperator
+        ? recordedState.operator.mightChangeDocument
+        : action.mightChangeDocument;
+
       if (this.vimState.alteredHistory) {
         this.vimState.alteredHistory = false;
         vimState.historyTracker.ignoreChange();
-      } else {
+      } else if (!configuration.experimentalOptimizations || mightChangeDocument) {
         const addedChange = vimState.historyTracker.addChange(
           this.vimState.cursorsInitialState.map(c => c.stop)
         );
-        const mightChangeDocument = recordedState.hasRunOperator
-          ? recordedState.operator.mightChangeDocument
-          : action.mightChangeDocument;
         if (addedChange && !mightChangeDocument) {
           throw new Error(`Action '${action.toString()}' changed the document unexpectedly!`);
         }