Merge pull request #1429 from xconverge/space-as-leader-fix

minor cleanup to improve leader usage with <space>
VSCodeVim · Mar 25, 2017 · f0c584a · f0c584a
2 parents 84d209f + 9276134
commit f0c584a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts
@@ -62,6 +62,11 @@ class ConfigurationClass {
       }
     }
 
+    // <space> is special, change it to " " internally if it is used as leader
+    if (this.leader.toLowerCase() === "<space>") {
+      this.leader = " ";
+    }
+
     // Get the cursor type from vscode
     const cursorStyleString = vscode.workspace.getConfiguration().get("editor.cursorStyle") as string;
     this.userCursor = this.cursorStyleFromString(cursorStyleString);

diff --git a/src/notation.ts b/src/notation.ts
@@ -30,12 +30,6 @@ export class AngleBracketNotation {
     }
 
     if (key.toLowerCase() === "<leader>") {
-      // <space> is special, change it to " " internally if it is used
-      if (Configuration.leader.toLowerCase() === "<space>") {
-        Configuration.leader = " ";
-      }
-
-      // Otherwise just return leader from config as-is
       return Configuration.leader;
     }