fix: fixes #2296. status bar was not updating properly when recording…

… macros
VSCodeVim · Jan 17, 2018 · fd9d05b · fd9d05b
1 parent f07d46f
commit fd9d05b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/src/cmd_line/commandLine.ts b/src/cmd_line/commandLine.ts
@@ -40,7 +40,7 @@ export class CommandLine {
     } catch (e) {
       console.log(e);
       if (e instanceof VimError) {
-        StatusBar.SetText(`${e.toString()}. ${command}`, vimState.currentMode, true);
+        StatusBar.SetText(`${e.toString()}. ${command}`, vimState.currentMode, vimState.isRecordingMacro, true);
       } else {
         util.showError(e.toString());
       }

diff --git a/src/cmd_line/commands/write.ts b/src/cmd_line/commands/write.ts
@@ -63,11 +63,11 @@ export class WriteCommand extends node.CommandBase {
           if (!e) {
             return this.save(vimState);
           }
-          StatusBar.SetText(e.message, vimState.currentMode, true);
+          StatusBar.SetText(e.message, vimState.currentMode, vimState.isRecordingMacro, true);
           return;
         });
       } else {
-        StatusBar.SetText(accessErr.message, vimState.currentMode, true);
+        StatusBar.SetText(accessErr.message, vimState.currentMode, vimState.isRecordingMacro, true);
       }
     }
   }
@@ -83,9 +83,9 @@ export class WriteCommand extends node.CommandBase {
           'L ' +
           vimState.editor.document.getText().length +
           'C written';
-        StatusBar.SetText(text, vimState.currentMode, true);
+        StatusBar.SetText(text, vimState.currentMode, vimState.isRecordingMacro, true);
       },
-      e => StatusBar.SetText(e, vimState.currentMode, true)
+      e => StatusBar.SetText(e, vimState.currentMode, vimState.isRecordingMacro, true)
     );
   }
 }
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -1388,13 +1388,14 @@ export class ModeHandler implements vscode.Disposable {
       text.push(this.currentMode.getStatusBarCommandText(this.vimState));
     }
 
+
     if (this.vimState.isRecordingMacro) {
       const macroText = 'Recording @' + this.vimState.recordedMacro.registerName;
       text.push(macroText);
     }
 
-    let forceUpdate = this.currentMode.name === ModeName.SearchInProgressMode;
-    StatusBar.SetText(text.join(' '), this.currentMode.name, forceUpdate);
+    let forceUpdate = this.currentMode.name === ModeName.SearchInProgressMode || this.vimState.isRecordingMacro;
+    StatusBar.SetText(text.join(' '), this.currentMode.name, this.vimState.isRecordingMacro, forceUpdate);
   }
 
   async handleMultipleKeyEvents(keys: string[]): Promise<void> {

diff --git a/src/statusBar.ts b/src/statusBar.ts
@@ -5,15 +5,21 @@ import { ModeName } from './mode/mode';
 class StatusBarClass implements vscode.Disposable {
   private _statusBarItem: vscode.StatusBarItem;
   private _prevModeName: ModeName | undefined;
+  private _isRecordingMacro: boolean;
 
   constructor() {
     this._statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
     this._prevModeName = undefined;
+    this._isRecordingMacro = false;
   }
 
-  public SetText(text: string, mode: ModeName, forceShow: boolean = false) {
-    if (mode !== this._prevModeName || forceShow) {
+  public SetText(text: string, mode: ModeName, isRecordingMacro: boolean, forceShow: boolean = false) {
+    let updateStatusBar = forceShow || this._prevModeName !== mode || this._isRecordingMacro !== isRecordingMacro;
+
       this._prevModeName = mode;
+      this._isRecordingMacro = isRecordingMacro;
+
+      if (updateStatusBar) {
       this._statusBarItem.text = text || '';
       this._statusBarItem.show();
     }

diff --git a/test/configuration/notation.test.ts b/test/configuration/notation.test.ts
@@ -13,6 +13,7 @@ suite('Notation', () => {
       '<CmD+a>': '<D-a>',
       eScapE: '<Esc>',
       '<LeAder>': '//',
+      'leader': '//',
     };
 
     for (const test in testCases) {