Merge branch 'master' into renovate/node-8.x

VSCodeVim · Nov 27, 2018 · 2d6ff89 · 2d6ff89
2 parents 3f8ea5d + f06b7e0
commit 2d6ff89
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/mode/modes.ts b/src/mode/modes.ts
@@ -2,6 +2,8 @@ import { Position } from './../common/motion/position';
 import { Mode, ModeName } from './mode';
 import { VSCodeVimCursorType } from './mode';
 import { VimState } from '../state/vimState';
+import { SearchDirection } from '../state/searchState';
+import { logger } from '../util/logger';
 
 export enum VisualBlockInsertionType {
   /**
@@ -63,7 +65,13 @@ export class SearchInProgressMode extends Mode {
   }
 
   getStatusBarText(vimState: VimState): string {
-    return `/${vimState.globalState.searchState!.searchString}`;
+    if (vimState.globalState.searchState === undefined) {
+      logger.error(`SearchInProgressMode.getStatusBarText: vimState.globalState.searchState is undefined.`);
+      return '';
+    }
+    const leadingChar =
+      vimState.globalState.searchState.searchDirection === SearchDirection.Forward ? '/' : '?';
+    return `${leadingChar}${vimState.globalState.searchState!.searchString}`;
   }
 
   getStatusBarCommandText(vimState: VimState): string {

diff --git a/src/state/searchState.ts b/src/state/searchState.ts
@@ -36,6 +36,10 @@ export class SearchState {
   private _cachedDocumentVersion: number;
   private _cachedDocumentName: String;
   private _searchDirection: SearchDirection = SearchDirection.Forward;
+  public get searchDirection(): SearchDirection {
+    return this._searchDirection;
+  }
+
   private isRegex: boolean;
 
   private _searchString = '';