From 976954c33bcb352b412cc2784ee87067a3e66e03 Mon Sep 17 00:00:00 2001 From: Julia Silge Date: Thu, 21 Nov 2024 20:49:52 -0700 Subject: [PATCH 1/4] Use new Quarto context keys in keyboard shortcuts --- extensions/positron-r/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/positron-r/package.json b/extensions/positron-r/package.json index 6159286eb42d..c1a134cabcbd 100644 --- a/extensions/positron-r/package.json +++ b/extensions/positron-r/package.json @@ -373,7 +373,7 @@ "command": "r.insertPipe", "key": "ctrl+shift+m", "mac": "cmd+shift+m", - "when": "editorLangId == r" + "when": "editorLangId == r || quartoLangId == r" }, { "command": "r.insertPipeConsole", @@ -385,7 +385,7 @@ "command": "r.insertLeftAssignment", "key": "alt+-", "mac": "alt+-", - "when": "editorLangId == r" + "when": "editorLangId == r || quartoLangId == r" }, { "command": "r.insertLeftAssignmentConsole", @@ -469,7 +469,7 @@ { "category": "R", "command": "r.insertPipe", - "when": "editorLangId == r" + "when": "editorLangId == r || quartoLangId == r" }, { "category": "R", @@ -479,7 +479,7 @@ { "category": "R", "command": "r.insertLeftAssignment", - "when": "editorLangId == r" + "when": "editorLangId == r || quartoLangId == r" }, { "category": "R", From 05df38b0aa30922d8437c7226b8e12c13964cf64 Mon Sep 17 00:00:00 2001 From: Julia Silge Date: Thu, 21 Nov 2024 20:57:25 -0700 Subject: [PATCH 2/4] Remove keybindings from RStudio Keymap --- extensions/positron-rstudio-keymap/package.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/extensions/positron-rstudio-keymap/package.json b/extensions/positron-rstudio-keymap/package.json index 24857653f0c2..2203abda7474 100644 --- a/extensions/positron-rstudio-keymap/package.json +++ b/extensions/positron-rstudio-keymap/package.json @@ -178,22 +178,6 @@ "when": "config.rstudio.keymap.enable && editorLangId == r", "command": "r.sourceCurrentFileWithEcho" }, - { - "mac": "cmd+shift+m", - "win": "ctrl+shift+m", - "linux": "ctrl+shift+m", - "key": "ctrl+shift+m", - "when": "config.rstudio.keymap.enable && editorLangId == quarto", - "command": "r.insertPipe" - }, - { - "mac": "alt+-", - "win": "alt+-", - "linux": "alt+-", - "key": "alt+-", - "when": "config.rstudio.keymap.enable && editorLangId == quarto", - "command": "r.insertLeftAssignment" - }, { "mac": "ctrl+alt+left", "win": "ctrl+alt+left", From d40f4119487010292e69bce07ff93aabc68cd13c Mon Sep 17 00:00:00 2001 From: Julia Silge Date: Tue, 26 Nov 2024 11:59:47 -0700 Subject: [PATCH 3/4] Use `quarto.document.languageId` context key --- extensions/positron-r/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/positron-r/package.json b/extensions/positron-r/package.json index c1a134cabcbd..51b3120cfc9e 100644 --- a/extensions/positron-r/package.json +++ b/extensions/positron-r/package.json @@ -373,7 +373,7 @@ "command": "r.insertPipe", "key": "ctrl+shift+m", "mac": "cmd+shift+m", - "when": "editorLangId == r || quartoLangId == r" + "when": "editorLangId == r || quarto.document.languageId == r" }, { "command": "r.insertPipeConsole", @@ -385,7 +385,7 @@ "command": "r.insertLeftAssignment", "key": "alt+-", "mac": "alt+-", - "when": "editorLangId == r || quartoLangId == r" + "when": "editorLangId == r || quarto.document.languageId == r" }, { "command": "r.insertLeftAssignmentConsole", @@ -469,7 +469,7 @@ { "category": "R", "command": "r.insertPipe", - "when": "editorLangId == r || quartoLangId == r" + "when": "editorLangId == r || quarto.document.languageId == r" }, { "category": "R", @@ -479,7 +479,7 @@ { "category": "R", "command": "r.insertLeftAssignment", - "when": "editorLangId == r || quartoLangId == r" + "when": "editorLangId == r || quarto.document.languageId == r" }, { "category": "R", From a6ca4c3ea46302e2622898822402571cfac361ee Mon Sep 17 00:00:00 2001 From: Julia Silge Date: Tue, 26 Nov 2024 14:56:36 -0700 Subject: [PATCH 4/4] Use new version of Quarto extension --- product.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product.json b/product.json index a8492c9abba8..19eebb6a5aff 100644 --- a/product.json +++ b/product.json @@ -208,7 +208,7 @@ }, { "name": "quarto.quarto", - "version": "1.114.0", + "version": "1.118.0", "repo": "https://github.com/quarto-dev/quarto/tree/main/apps/vscode", "metadata": { "id": "a1be81fc-0f3a-4f2e-92ee-3fdc7ab96c73",