Fix remapping keys to actions with "mustBeFirstKey", fixes #2216 #2117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
insidewhy
force-pushed
the
jp/2216
branch
3 times, most recently
from
0f9c6eb
to
3da94a4
Compare
insidewhy
commented
Nov 5, 2017
| vimState.recordedState.getCurrentCommandWithoutCountPrefix().length - keysPressed.length > | ||
| 0 && | ||
| this.mustBeFirstKey | ||
| this.mustBeFirstKey && |
There was a problem hiding this comment.
Take advantage of short-circuit evaluation to avoid work, only 3 commands have mustBeFirstKey set.
|
Simplified things a little. |
insidewhy
commented
Nov 5, 2017
| @@ -901,8 +921,6 @@ export class ModeHandler implements vscode.Disposable { | |||
|
|
|||
| if (result === KeypressState.NoPossibleMatch && !isPotentialRemapping) { | |||
| vimState.recordedState = new RecordedState(); | |||
| vimState.recordedState.commandList = []; | |||
There was a problem hiding this comment.
No point in repeating the work of the constructor here.
|
It might be simpler just to not add the remapped keys to |
|
looks good to me! |
|
So good you want to merge it 🌴 🛩 |
|
ship it! |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #2116