Merge branch 'main' into feat/protect-options-formatting

Author: mcanouil

.github/workflows/publish.yaml

@@ -22,13 +22,6 @@ jobs:
           node-version: latest
       - run: yarn install --immutable --immutable-cache --check-cache
 
-      - name: Publish to Open VSX Registry
-        uses: HaaLeo/publish-vscode-extension@v2
-        with:
-          pat: ${{ secrets.OPEN_VSX_TOKEN }}
-          yarn: true
-          packagePath: apps/vscode
-
       - name: Publish to Visual Studio Marketplace
         uses: HaaLeo/publish-vscode-extension@v2
         id: publish_extension
@@ -38,6 +31,13 @@ jobs:
           yarn: true
           packagePath: apps/vscode
 
+      - name: Publish to Open VSX Registry
+        uses: HaaLeo/publish-vscode-extension@v2
+        with:
+            pat: ${{ secrets.OPEN_VSX_TOKEN }}
+            yarn: true
+            packagePath: apps/vscode
+
       - name: Get version of VS Code extension to publish
         id: extension-version
         uses: 'euberdeveloper/ga-project-version@main'

apps/vscode/CHANGELOG.md

@@ -1,11 +1,17 @@
 # Changelog
 
-## 1.119.0 (unreleased)
+## 1.120.0 (unreleased)
+
+- Protect code cell options from formatting (<https://github.com/quarto-dev/quarto/pull/655>).
+
+## 1.119.0 (Release on 2025-03-21)
 
 - Use `QUARTO_VISUAL_EDITOR_CONFIRMED` > `PW_TEST` > `CI` to bypass (`true`) or force (`false`) the Visual Editor confirmation dialogue (<https://github.com/quarto-dev/quarto/pull/654>).
 - Fix behavior in Positron when running a cell containing invalid/incomplete code (<https://github.com/quarto-dev/quarto/pull/664>).
-- Protect code cell options from formatting (<https://github.com/quarto-dev/quarto/pull/655>).
+- Ensure `#|` is added only at the beginning of a new line (<https://github.com/quarto-dev/quarto/pull/649>).
 - Fix `language` typos throughout the codebase (<https://github.com/quarto-dev/quarto/pull/650>)
+- Update cell background configuration to add the ability to use the appropriate theme color. The `quarto.cells.background` settings have changed names so you may need to update your configuration (<https://github.com/quarto-dev/quarto/pull/679>).
+- Use new command to switch between source and visual editors in Positron (<https://github.com/quarto-dev/quarto/pull/684>).
 
 ## 1.118.0 (Release on 2024-11-26)
 

apps/vscode/package.json

@@ -11,7 +11,7 @@
     "pandoc",
     "quarto"
   ],
-  "version": "1.119.0",
+  "version": "1.120.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/quarto-dev/quarto/tree/main/apps/vscode"
@@ -938,27 +938,38 @@
           "markdownDescription": "Show parameter help when editing function calls."
         },
         "quarto.cells.background.enabled": {
+          "type": "boolean",
+          "description": "Enable coloring the background of executable code cells.",
+          "deprecationMessage": "Deprecated: Please use quarto.cells.background.color instead."
+        },
+        "quarto.cells.background.color": {
           "order": 19,
           "scope": "window",
-          "type": "boolean",
-          "default": true,
-          "markdownDescription": "Enable coloring the background of executable code cells."
+          "type": "string",
+          "markdownDescription": "Control the background coloring of executable code cells.",
+          "default": "default",
+          "enum": ["default", "useTheme", "off"],
+          "markdownEnumDescriptions": [
+            "Use the default light and dark background colors. Specify these colors with `quarto.cells.background.lightDefault` and `quarto.cells.background.darkDefault`.",
+            "Use the `notebook.selectedCellBackground` color from the current VS Code theme.",
+            "Disable background coloring of executable code cells."
+          ]
         },
-        "quarto.cells.background.light": {
+        "quarto.cells.background.lightDefault": {
           "order": 20,
           "scope": "window",
           "type": "string",
           "format": "color",
           "default": "#E1E1E166",
-          "markdownDescription": "CSS color for background of executable code cells on light themes.\n\n*Note that this color should include an alpha channel so that selections show up against the background.*"
+          "markdownDescription": "CSS color for background of executable code cells on light themes.\n\n*Note that this color should include an alpha channel, like #RRGGBBAA, so that selections show up against the background.*"
         },
-        "quarto.cells.background.dark": {
+        "quarto.cells.background.darkDefault": {
           "order": 21,
           "scope": "window",
           "type": "string",
           "format": "color",
           "default": "#40404066",
-          "markdownDescription": "CSS color for background of executable code cells on dark themes.\n\n*Note that this color should include an alpha channel so that selections show up against the background.*"
+          "markdownDescription": "CSS color for background of executable code cells on dark themes.\n\n*Note that this color should include an alpha channel, like #RRGGBBAA, so that selections show up against the background.*"
         },
         "quarto.cells.background.delay": {
           "order": 22,

apps/vscode/src/providers/background.ts

@@ -192,6 +192,12 @@ function clearEditorHighlightDecorations(editor: vscode.TextEditor) {
   editor.setDecorations(highlightingConfig.backgroundDecoration(), []);
 }
 
+enum CellBackgroundColor {
+  default = "default",
+  off = "off",
+  useTheme = "useTheme",
+}
+
 class HiglightingConfig {
   constructor() { }
 
@@ -213,10 +219,18 @@ class HiglightingConfig {
 
   public sync() {
     const config = vscode.workspace.getConfiguration("quarto");
-    const light = config.get("cells.background.light", "#E1E1E166");
-    const dark = config.get("cells.background.dark", "#40404066");
+    const backgroundOption = config.get<CellBackgroundColor>("cells.background.color", CellBackgroundColor.default);
+    let light, dark;
+    if (backgroundOption === CellBackgroundColor.useTheme) {
+      const activeCellBackgroundThemeColor = new vscode.ThemeColor('notebook.selectedCellBackground');
+      light = activeCellBackgroundThemeColor;
+      dark = activeCellBackgroundThemeColor;
+    } else {
+      light = config.get<string>("cells.background.lightDefault", "#E1E1E166");
+      dark = config.get<string>("cells.background.darkDefault", "#40404066");
+    }
 
-    this.enabled_ = config.get("cells.background.enabled", true);
+    this.enabled_ = backgroundOption !== CellBackgroundColor.off;
     this.delayMs_ = config.get("cells.background.delay", 250);
 
 

apps/vscode/src/providers/editor/toggle.ts

@@ -19,6 +19,7 @@ import { Command } from "../../core/command";
 import { isQuartoDoc, kQuartoLanguageId } from "../../core/doc";
 import { VisualEditorProvider } from "./editor";
 import { Uri } from "vscode";
+import { hasHooks } from "../../host/hooks";
 
 export function determineMode(text: string, uri: Uri): string | undefined {
   let editorOpener = undefined;
@@ -100,47 +101,53 @@ export async function reopenEditorInVisualMode(
   document: TextDocument,
   viewColumn?: ViewColumn
 ) {
-
-  // save then close
-  await commands.executeCommand("workbench.action.files.save");
-  await commands.executeCommand('workbench.action.closeActiveEditor');
-  VisualEditorProvider.recordPendingSwitchToVisual(document);
-  // open in visual mode
-  await commands.executeCommand("vscode.openWith",
-    document.uri,
-    VisualEditorProvider.viewType,
-    {
-      viewColumn
-    }
-  );
+  if (hasHooks()) {
+    commands.executeCommand('positron.reopenWith', document.uri, 'quarto.visualEditor');
+  } else {
+    // save then close
+    await commands.executeCommand("workbench.action.files.save");
+    await commands.executeCommand('workbench.action.closeActiveEditor');
+    VisualEditorProvider.recordPendingSwitchToVisual(document);
+    // open in visual mode
+    await commands.executeCommand("vscode.openWith",
+      document.uri,
+      VisualEditorProvider.viewType,
+      {
+        viewColumn
+      }
+    );
+  }
 }
 
 export async function reopenEditorInSourceMode(
   document: TextDocument,
   untitledContent?: string,
   viewColumn?: ViewColumn
 ) {
-  if (!document.isUntitled) {
-    await commands.executeCommand("workbench.action.files.save");
-  }
-
-  // note pending switch to source
-  VisualEditorProvider.recordPendingSwitchToSource(document);
-
-  // close editor (return immediately as if we don't then any
-  // rpc method that calls this wil result in an error b/c the webview
-  // has been torn down by the time we return)
-  commands.executeCommand('workbench.action.closeActiveEditor').then(async () => {
-    if (document.isUntitled) {
-      const doc = await workspace.openTextDocument({
-        language: kQuartoLanguageId,
-        content: untitledContent || '',
-      });
-      await window.showTextDocument(doc, viewColumn, false);
-    } else {
-      const doc = await workspace.openTextDocument(document.uri);
-      await window.showTextDocument(doc, viewColumn, false);
+  if (hasHooks()) {
+    commands.executeCommand('positron.reopenWith', document.uri, 'default');
+  } else {
+    if (!document.isUntitled) {
+      await commands.executeCommand("workbench.action.files.save");
     }
-  });
 
+    // note pending switch to source
+    VisualEditorProvider.recordPendingSwitchToSource(document);
+
+    // close editor (return immediately as if we don't then any
+    // rpc method that calls this wil result in an error b/c the webview
+    // has been torn down by the time we return)
+    commands.executeCommand('workbench.action.closeActiveEditor').then(async () => {
+      if (document.isUntitled) {
+        const doc = await workspace.openTextDocument({
+          language: kQuartoLanguageId,
+          content: untitledContent || '',
+        });
+        await window.showTextDocument(doc, viewColumn, false);
+      } else {
+        const doc = await workspace.openTextDocument(document.uri);
+        await window.showTextDocument(doc, viewColumn, false);
+      }
+    });
+  }
 }

apps/vscode/src/providers/option.ts

@@ -84,7 +84,7 @@ function handleOptionEnter(editor: TextEditor, comment: string) {
     });
   } else if (currentLine.startsWith(optionComment)) {
     editor.edit((builder) => {
-      builder.insert(editor.selection.start.translate(1, 0), optionComment);
+      builder.insert(editor.selection.start.translate(1, -editor.selection.active.character), optionComment);
     });
   }
 }