Fix override of default key bindings #14668
Merged
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.
fixed #14667
What it does
fixes #14667
If a key binding is overridden by the user, an entry like this is added to the keymaps.json to indicate that the original keybinding is not valid anymore (with a '-' in the beginning of the command id:
The code in 'matchKeybinding' (see only change in this PR) records this and makes the key binding invalid also in upper contexts. However, it first checks "isEnabled" which in 'isEnabledInScope' checks 'this.commandRegistry.isEnabled(binding.command, binding.args)'
This is always false for invalid commands and the '-' makes commands invalid. As a consequence, 'isUsable' is not checked anymore, and the isUsable list is not correctly filled.
Therefore, turning the checks around, i.e. first checking isUsable fixes the issues, as overriden commands are now correctly remembers.
How to test
see #14667
Breaking changes
Review checklist
Reminder for reviewers