Index fixes

src/actions/actions.ts

@@ -1465,12 +1465,25 @@ class CommandInsertInSearchMode extends BaseCommand {
       return vimState;
     } else if (key === "<up>") {
       const prevSearchList = vimState.globalState.searchStatePrevious!;
+
+      // Preincrement if on boundary to prevent seeing the same search index twice
+      if (vimState.globalState.searchStateIndex === vimState.globalState.searchStatePrevious.length - 1
+        && searchState.searchString !== "") {
+        vimState.globalState.searchStateIndex -= 1;
+      }
+
       if (prevSearchList[vimState.globalState.searchStateIndex] !== undefined) {
         searchState.searchString = prevSearchList[vimState.globalState.searchStateIndex].searchString;
         vimState.globalState.searchStateIndex -= 1;
       }
     } else if (key === "<down>") {
       const prevSearchList = vimState.globalState.searchStatePrevious!;
+
+      // Preincrement if on boundary to prevent seeing the same search index twice
+      if (vimState.globalState.searchStateIndex === 0) {
+        vimState.globalState.searchStateIndex += 1;
+      }
+
       if (prevSearchList[vimState.globalState.searchStateIndex] !== undefined) {
         searchState.searchString = prevSearchList[vimState.globalState.searchStateIndex].searchString;
         vimState.globalState.searchStateIndex += 1;
@@ -2917,7 +2930,13 @@ class CommandGoForwardInChangelist extends BaseCommand {
   keys = ["g", ","];
 
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
-    const originalIndex = vimState.historyTracker.changelistIndex;
+    let originalIndex = vimState.historyTracker.changelistIndex;
+
+    // Preincrement if on boundary to prevent seeing the same index twice
+    if (originalIndex === 1) {
+      originalIndex += 1;
+    }
+
     const nextPos = vimState.historyTracker.getChangePositionAtindex(originalIndex);
 
     if (nextPos !== undefined) {

src/history/historyTracker.ts

@@ -16,6 +16,7 @@ import * as _ from "lodash";
 import { Position } from './../motion/position';
 import { TextEditor } from './../textEditor';
 import { RecordedState } from './../mode/modeHandler';
+import { Configuration } from './../configuration/configuration';
 
 import DiffMatchPatch = require("diff-match-patch");
 
@@ -399,6 +400,11 @@ export class HistoryTracker {
 
         this.currentHistoryStep.changes.push(change);
 
+        // Make sure history length does not exceed configuration option
+        if (this.currentHistoryStep.changes.length > Configuration.history) {
+          this.currentHistoryStep.changes.splice(0, 1);
+        }
+
         if (change && this.currentHistoryStep.cursorStart === undefined) {
           this.currentHistoryStep.cursorStart = cursorPosition;
         }

src/motion/position.ts

@@ -366,6 +366,11 @@ export class Position extends vscode.Position {
       return this.getLeft();
     }
 
+    // First char on first line, can not go left any more
+    if (this.line === 0) {
+      return this;
+    }
+
     return this.getUp(0).getLineEnd();
   }