From a6eeb945f5e6d4d9587f8b677cbc0a3662e24952 Mon Sep 17 00:00:00 2001
From: rebornix <penn.lv@gmail.com>
Date: Thu, 17 Nov 2016 13:39:26 -0800
Subject: [PATCH] fix #1047

---
 src/cmd_line/commands/quit.ts | 3 +--
 src/mode/modeHandler.ts       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cmd_line/commands/quit.ts b/src/cmd_line/commands/quit.ts
index 27de79f2436..53efa29aae1 100644
--- a/src/cmd_line/commands/quit.ts
+++ b/src/cmd_line/commands/quit.ts
@@ -43,5 +43,4 @@ export class QuitCommand extends node.CommandBase {
         await vscode.commands.executeCommand('workbench.action.previousEditor');
       }
     }
-  }
-}
+  }}
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
index 88249a808a3..d5bee149ee4 100644
--- a/src/mode/modeHandler.ts
+++ b/src/mode/modeHandler.ts
@@ -1487,8 +1487,7 @@ export class ModeHandler implements vscode.Disposable {
 
     // Draw search highlight
 
-    if (this.currentMode.name === ModeName.SearchInProgressMode ||
-      (Configuration.getInstance().hlsearch && vimState.searchState)) {
+    if (Configuration.getInstance().hlsearch && (this.currentMode.name === ModeName.SearchInProgressMode || vimState.searchState)) {
       const searchState = vimState.searchState!;
 
       rangesToDraw.push.apply(rangesToDraw, searchState.matchRanges);