Do not resolve keymap in the middle of sequence in command-based modes.

This fixes issues when subsequence is matching a top level mapping: nmap ]] :nextmember<CR> Will break ci] or '].
vrapper · Jun 5, 2013 · d089258 · d089258 · albertdev · Apr 14, 2014
1 parent db94676
commit d089258
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/net.sourceforge.vrapper.core/src/net/sourceforge/vrapper/vim/modes/CommandBasedMode.java b/net.sourceforge.vrapper.core/src/net/sourceforge/vrapper/vim/modes/CommandBasedMode.java
@@ -315,7 +315,11 @@ private void reset() {
     }
 
     public KeyMap resolveKeyMap(KeyMapProvider provider) {
-        return provider.getKeyMap(keyMapResolver.getKeyMapName());
+        if (currentState == initialState) {
+            return provider.getKeyMap(keyMapResolver.getKeyMapName());
+        } else {
+            return null;
+        }
     }
 
     public void leaveMode(ModeSwitchHint... hints) throws CommandExecutionException {