Skip to content

Commit 0c10b5e

Browse files
authored
ux: Fix conflict on edit prediction + lsp prediction (#42)
1 parent 58fb057 commit 0c10b5e

1 file changed

Lines changed: 25 additions & 0 deletions

File tree

‎package.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,35 @@
7070
"key": "tab",
7171
"when": "editorTextFocus && sweep.hasJumpEdit && !editorHasSelection && !inlineSuggestionVisible && !suggestWidgetVisible"
7272
},
73+
{
74+
"command": "sweep.acceptJumpEdit",
75+
"key": "alt+tab",
76+
"when": "editorTextFocus && sweep.hasJumpEdit && !editorHasSelection"
77+
},
78+
{
79+
"command": "sweep.acceptJumpEdit",
80+
"key": "alt+l",
81+
"when": "isLinux && editorTextFocus && sweep.hasJumpEdit && !editorHasSelection"
82+
},
7383
{
7484
"command": "sweep.dismissJumpEdit",
7585
"key": "escape",
7686
"when": "editorTextFocus && sweep.hasJumpEdit"
87+
},
88+
{
89+
"command": "editor.action.inlineSuggest.commit",
90+
"key": "alt+tab",
91+
"when": "editorTextFocus && inlineSuggestionVisible && suggestWidgetVisible && !editorHasSelection && !sweep.hasJumpEdit && !inSnippetMode"
92+
},
93+
{
94+
"command": "editor.action.inlineSuggest.commit",
95+
"key": "alt+l",
96+
"when": "isLinux && editorTextFocus && inlineSuggestionVisible && suggestWidgetVisible && !editorHasSelection && !sweep.hasJumpEdit && !inSnippetMode"
97+
},
98+
{
99+
"command": "editor.action.inlineSuggest.hide",
100+
"key": "escape",
101+
"when": "editorTextFocus && inlineSuggestionVisible && !suggestWidgetVisible && !sweep.hasJumpEdit"
77102
}
78103
],
79104
"configuration": {

0 commit comments

Comments
 (0)