From 2c110e8f18d4dee0b5c0e903a5c672ac5ddc65d0 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Wed, 19 Aug 2020 19:24:09 +0900 Subject: [PATCH 1/2] Remove Ctrl + 1, 2, 3, 4, 5 shortcuts --- README.md | 10 +++++++--- package.json | 30 ------------------------------ 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 1ae2ab3b9..65b6a1ba1 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,13 @@ Full document is on the [Wiki page](https://github.com/Ikuyadeu/vscode-R/wiki) ## Features -* Run Source(`Ctrl+Shift+S` or Push icon![icon](images/FileDownload.png)) and Run Selected Line (`Ctrl+Enter`) -* Run `nrow`, `length`, `head`, `thead`, `names` functions (`Ctrl` + `1`, `2`, `3`, `4`, `5`) - * If you are using Mac `Ctrl` to `⌘` +* Run Source(`Ctrl+Shift+S` or Push icon![icon](images/FileDownload.png)) and Run Selected Line (`Ctrl+Enter`) (Mac: `Ctrl` to `⌘`) +* Run functions: + * `nrow` (`Show number of rows for selected object`) + * `length` (`Show length for a selected object`) + * `head` (`Show first part of a selected object`) + * `thead` (`Show first part of a selected object (transposed)`) + * `names` (`Show names for a selected object`) ![use Run .R](images/feature.png) diff --git a/package.json b/package.json index 2f256ba1d..f5d27f24d 100644 --- a/package.json +++ b/package.json @@ -381,36 +381,6 @@ "mac": "option+enter", "when": "editorTextFocus && editorLangId == 'r'" }, - { - "command": "r.nrow", - "key": "Ctrl+1", - "mac": "cmd+1", - "when": "editorTextFocus && editorLangId == 'r'" - }, - { - "command": "r.length", - "key": "Ctrl+2", - "mac": "cmd+2", - "when": "editorTextFocus && editorLangId == 'r'" - }, - { - "command": "r.head", - "key": "Ctrl+3", - "mac": "cmd+3", - "when": "editorTextFocus && editorLangId == 'r'" - }, - { - "command": "r.thead", - "key": "Ctrl+4", - "mac": "cmd+4", - "when": "editorTextFocus && editorLangId == 'r'" - }, - { - "command": "r.names", - "key": "Ctrl+5", - "mac": "cmd+5", - "when": "editorTextFocus && editorLangId == 'r'" - }, { "command": "r.runSource", "key": "shift+Ctrl+s", From 9ea78b408653fe0de34cfd169ab5af29912d601d Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Wed, 2 Sep 2020 21:56:02 +0900 Subject: [PATCH 2/2] Update CHANGELOG for removing Ctrl + 1, 2, 3, 4, 5 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b561d8a07..65df6b49f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 1.4.5 + +* Remove shortcuts Ctrl + 1, 2, 3, 4, 5 #401 (Fix #368) + + These conflicted with default Visual Studio Code keyboard shortcuts. If you would like to restore them, see the [instructions in the Wiki](https://github.com/Ikuyadeu/vscode-R/wiki/Keyboard-shortcuts#removed-keyboard-shortcuts). + ## 1.4.4 * Fix vulnerability issues