-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Store keybindings properly in keymaps.json and improve conflict checking #9088
Store keybindings properly in keymaps.json and improve conflict checking #9088
Conversation
Fixes issue eclipse-theia#9087 Contributed by STMicroelectronics Signed-off-by: Samuel HULTGREN <samuel.hultgren@st.com>
63ef3c7
to
115667a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have verified it; it works as expected. Thank you so much for your help, @slhultgren 👍
* Returns with the string representation of the binding. | ||
* Any additional properties which are not described on | ||
* the `Keybinding` API will be ignored. | ||
* Compares two keybingings for equality. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
keybingings -> keybindings
Make sure disablements for keymappings are only stored once in keymaps.json. Only check conflicting keybindings against usable keybindings. Fixes eclipse-theia#9094 Contributed by STMicroelectronics Signed-off-by: Samuel HULTGREN <samuel.hultgren@st.com>
115667a
to
4119bdb
Compare
Thanks for the review, I amended the commit and fixed the typo :) |
I consider the |
Fixes issue #9087
Fixes issue #9094
What it does
Contributed by STMicroelectronics
How to test
Change some shortcuts (at least 2), observe that no "resolved" properties are stored in the keymaps.
Also, follow steps in #9094.
For example, without this patch keymaps.json might contain:
With this patch, keymaps.json will contain instead:
Review checklist
Reminder for reviewers