fix: merge.toggleActiveConflict as shortcuts
#225320
Merged
Conversation
This file contains hidden or 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
When Merge Editor's actions are assigned to keyboard like this:
```json
[
{
"key": "ctrl+g a",
"command": "merge.toggleActiveConflictInput1",
"when": "isMergeEditor"
},
{
"key": "ctrl+g b",
"command": "merge.toggleActiveConflictInput2",
"when": "isMergeEditor"
},
{
"key": "ctrl+g ctrl+a",
"command": "merge.acceptAllInput1",
"when": "isMergeEditor"
},
{
"key": "ctrl+g ctrl+b",
"command": "merge.acceptAllInput2",
"when": "isMergeEditor"
},
]
```
Any of such action changes the state of the merged editor so diff range
becomes locked, i.e. even if a cursor is moved to another diff range the
actions target the locked one. If focus is changed the merge editor
returns to a normal state. This behavior is only reproducible if all the
actions are performed with keyboard because mouse clicking and calling
the actions from the command pallette changes the focus and everything
works correctly.
Fixes microsoft#225319
6951df1 to
58095aa
Compare
Member
|
Thanks! |
hediet
approved these changes
Aug 12, 2024
bpasero
approved these changes
Aug 12, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
When Merge Editor's actions are assigned to keyboard like this:
[ { "key": "ctrl+g a", "command": "merge.toggleActiveConflictInput1", "when": "isMergeEditor" }, { "key": "ctrl+g b", "command": "merge.toggleActiveConflictInput2", "when": "isMergeEditor" }, { "key": "ctrl+g ctrl+a", "command": "merge.acceptAllInput1", "when": "isMergeEditor" }, { "key": "ctrl+g ctrl+b", "command": "merge.acceptAllInput2", "when": "isMergeEditor" }, ]Any of such action changes the state of the merged editor so diff range becomes locked, i.e. even if a cursor is moved to another diff range the actions target the locked one. If focus is changed the merge editor returns to a normal state. This behavior is only reproducible if all the actions are performed with keyboard because mouse clicking and calling the actions from the command pallette changes the focus and everything works correctly.
Fixes #225319
merge-editor-fix-after.webm