From ad15edfc4d88611b0653af9a5a0e9bce9022c83e Mon Sep 17 00:00:00 2001
From: Jason Fields <jasonfields4@gmail.com>
Date: Tue, 10 Dec 2019 13:17:06 -0500
Subject: [PATCH] Make sure DocumentChange.timestamp is always set

This seems like it could be incorrect sometimes, and we should make sure all changes are either declared finished at their creation or finished before they can be undone.
Also remove an instance of suite.only() that slipped in...whoops
Fixes #4351
---
 src/cmd_line/commandLine.ts      |  3 +++
 src/history/historyTracker.ts    | 24 +++++++++++++++---------
 test/mode/modeHandlerMap.test.ts |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/cmd_line/commandLine.ts b/src/cmd_line/commandLine.ts
index 4c6d3835f09..beb85a64378 100644
--- a/src/cmd_line/commandLine.ts
+++ b/src/cmd_line/commandLine.ts
@@ -98,6 +98,9 @@ class CommandLine {
     }
   }
 
+  /**
+   * Prompts the user for a command using an InputBox, and runs the provided command
+   */
   public async PromptAndRun(initialText: string, vimState: VimState): Promise<void> {
     if (!vscode.window.activeTextEditor) {
       this._logger.debug('No active document');
diff --git a/src/history/historyTracker.ts b/src/history/historyTracker.ts
index 5f5740990ab..9ea00fcf6cb 100644
--- a/src/history/historyTracker.ts
+++ b/src/history/historyTracker.ts
@@ -24,6 +24,12 @@ diffEngine.Diff_Timeout = 1; // 1 second
 
 class DocumentChange {
   public readonly start: Position;
+
+  /**
+   * true => addition
+   * false => deletion
+   */
+   // TODO: support replacement, which would cut the number of changes for :s/foo/bar in half
   public isAdd: boolean;
 
   private _end: Position;
@@ -89,8 +95,9 @@ class HistoryStep {
 
   /**
    * When this step was finished.
+   * // TODO: we currently set it to the current time upon creation to cover some edge cases, but this is messy.
    */
-  timestamp: Date | undefined;
+  timestamp: Date;
 
   /**
    * The cursor position at the start of this history step.
@@ -107,8 +114,6 @@ class HistoryStep {
    */
   marks: IMark[] = [];
 
-  vimState: VimState;
-
   constructor(init: {
     changes?: DocumentChange[];
     isFinished?: boolean;
@@ -122,6 +127,9 @@ class HistoryStep {
     this.cursorStart = init.cursorStart || undefined;
     this.cursorEnd = init.cursorEnd || undefined;
     this.marks = init.marks || [];
+
+    // This will usually be overwritten when the HistoryStep is finished
+    this.timestamp = new Date();
   }
 
   /**
@@ -174,19 +182,18 @@ class HistoryStep {
    * Returns, as a string, the time that has passed since this step took place.
    */
   public howLongAgo(): string {
-    const timestamp = this.timestamp!;
     const now = new Date();
-    const timeDiffMillis = now.getTime() - timestamp.getTime();
+    const timeDiffMillis = now.getTime() - this.timestamp.getTime();
     const timeDiffSeconds = Math.floor(timeDiffMillis / 1000);
     if (timeDiffSeconds === 1) {
       return `1 second ago`;
     } else if (timeDiffSeconds >= 100) {
-      const hours = timestamp.getHours();
-      const minutes = timestamp
+      const hours = this.timestamp.getHours();
+      const minutes = this.timestamp
         .getMinutes()
         .toString()
         .padStart(2, '0');
-      const seconds = timestamp
+      const seconds = this.timestamp
         .getSeconds()
         .toString()
         .padStart(2, '0');
@@ -662,7 +669,6 @@ export class HistoryTracker {
       cursorEnd: [lastChange.start],
     });
     newStep.changes = changesToUndo;
-    newStep.timestamp = new Date();
 
     this.historySteps.push(newStep);
 
diff --git a/test/mode/modeHandlerMap.test.ts b/test/mode/modeHandlerMap.test.ts
index 39ba3763f75..8d5a05a93ac 100644
--- a/test/mode/modeHandlerMap.test.ts
+++ b/test/mode/modeHandlerMap.test.ts
@@ -3,7 +3,7 @@ import * as assert from 'assert';
 import { ModeHandlerMap } from '../../src/mode/modeHandlerMap';
 import { EditorIdentity } from '../../src/editorIdentity';
 
-suite.only('Mode Handler Map', () => {
+suite('Mode Handler Map', () => {
   setup(() => {
     ModeHandlerMap.clear();
   });