aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-04-15 11:11:20 +0100
committerGitHub <[email protected]>2020-04-15 11:11:20 +0100
commitf1a07dbf5559e882f46e79ed2a299cf151b99498 (patch)
tree84ae48bf293d68443b417a5a5a1185db006b7872 /editors
parent1e0ba04033df87d6966140f74c2f63d0e143fb63 (diff)
parentf8fb009cadd6d0f837cc0236343a226850ae0974 (diff)
Merge #3962
3962: Fix parentModule shortcut conflict r=matklad a=CodeSandwich The default parentModule shortcut conflicts with VSCode's built-in undo selection Co-authored-by: Igor Żuk <[email protected]>
Diffstat (limited to 'editors')
-rw-r--r--editors/code/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 33bd66b40..5f73c8d83 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -154,7 +154,7 @@
154 "keybindings": [ 154 "keybindings": [
155 { 155 {
156 "command": "rust-analyzer.parentModule", 156 "command": "rust-analyzer.parentModule",
157 "key": "ctrl+u", 157 "key": "ctrl+shift+u",
158 "when": "editorTextFocus && editorLangId == rust" 158 "when": "editorTextFocus && editorLangId == rust"
159 }, 159 },
160 { 160 {