support hlsearch

VSCodeVim · Jul 25, 2016 · 5a36734 · 5a36734
1 parent 4e291cb
commit 5a36734
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/cmd_line/commands/setoptions.ts b/src/cmd_line/commands/setoptions.ts
@@ -59,7 +59,7 @@ export class SetOptionsCommand extends node.CommandBase {
         Configuration.getInstance().set(this._arguments.name!, false);
         break;
       case SetOptionOperator.Equal:
-        Configuration.getInstance().set(this._arguments.name!, this._arguments.value);
+        Configuration.getInstance().set(this._arguments.name!, this._arguments.value!);
         break;
       default:
         break;

diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts
@@ -66,7 +66,6 @@ export class BaseOptionDetails {
   }
 
   public source: OptionValueSource = OptionValueSource.Default;
-  public shouldUpdateView: boolean;
   static globalOptionUpdateHandler: () => void;
 }
 
@@ -97,6 +96,12 @@ class OptionScroll extends BaseOptionDetails {
   defaultValue = 20;
 }
 
+@RegisterOption
+class OptionHightlightSearch extends BaseOptionDetails {
+  id = "hlsearch";
+  defaultValue = false;
+}
+
 @RegisterOption
 class OptionIgnoreCase extends BaseOptionDetails {
   id = "ignorecase";
@@ -235,10 +240,10 @@ export class Configuration {
     return Configuration._instance;
   }
 
-  set(option: string, value?: number | string | boolean, source?: OptionValueSource): void {
+  set(option: string, value: number | string | boolean, source?: OptionValueSource): void {
     let targetOption = OptionMap.allOptions[option];
 
-    if (!value) {
+    if (!targetOption) {
       return;
     }
 

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -895,7 +895,8 @@ export class ModeHandler implements vscode.Disposable {
 
     // Draw search highlight
 
-    if (this.currentMode.name === ModeName.SearchInProgressMode) {
+    if (this.currentMode.name === ModeName.SearchInProgressMode ||
+      (Configuration.getInstance().get("hlsearch") && vimState.searchState)) {
       const searchState = vimState.searchState!;
 
       rangesToDraw.push.apply(rangesToDraw, searchState.matchRanges);