check if this is a diff

Author: isabelizimm

apps/vscode/package.json

@@ -1392,7 +1392,7 @@
     "@types/semver": "^7.3.13",
     "@types/tmp": "^0.2.3",
     "@types/uuid": "^9.0.0",
-    "@types/vscode": "1.66.0",
+    "@types/vscode": "1.94.0",
     "@types/which": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",

apps/vscode/src/main.ts

@@ -128,7 +128,6 @@ export async function activate(context: vscode.ExtensionContext) {
   // activate providers common to browser/node
   activateCommon(context, host, engine, commands);
 
-
   if (hasHooks()) {
     // Positron allows user to set visual or source as default mode
     setEditorOpener();

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

@@ -13,7 +13,7 @@
  *
  */
 
-import path, { extname } from "path";
+import path, { extname, win32 } from "path";
 import { determineMode } from "./toggle"
 import debounce from "lodash.debounce";
 
@@ -58,13 +58,22 @@ import { MarkdownEngine } from "../../markdown/engine";
 import { lspClientTransport } from "core-node";
 import { editorSourceJsonRpcServer } from "editor-core";
 import { JsonRpcRequestTransport } from "core";
-import { 
-  editInSourceModeCommand, 
-  editInVisualModeCommand, 
-  reopenEditorInSourceMode 
+import {
+  editInSourceModeCommand,
+  editInVisualModeCommand,
+  reopenEditorInSourceMode
 } from "./toggle";
 import { ExtensionHost } from "../../host";
 
+const labels = [
+  "(Working Tree)",
+  "(Deleted)",
+  "(Theirs)",
+  "(Ours)",
+  "(Untracked)",
+  "(Intent to add)",
+  "(Type changed)"
+];
 
 export interface QuartoVisualEditor extends QuartoEditor {
   hasFocus() : Promise<boolean>;
@@ -146,16 +155,21 @@ export class VisualEditorProvider implements CustomTextEditorProvider {
       if (!editor) {
         return;
       }
+
       const document = editor.document;
       if (document && isQuartoDoc(document)) {
         const uri = document.uri.toString();
         // check for switch (one shot)
         const isSwitch = this.visualEditorPendingSwitchToSource.has(uri);
 
+        // check to see if this is a git diff. if so, do not try to change editor mode
+        const tabLabel = window.tabGroups.activeTabGroup.activeTab?.label
+        const isDiff = labels.some(label => tabLabel?.includes(label))
+
         // see if user has specified visual or source mode
         const config = workspace.getConfiguration('quarto').get<string>('defaultEditor');
         const editorMode = await determineMode(document);
-        if (editorMode && editorMode != config && !isSwitch) {
+        if (editorMode && editorMode != config && !isSwitch && !isDiff) {
           const editorOpener = editorMode === 'visual' ? VisualEditorProvider.viewType : 'textEditor';
           await commands.executeCommand('workbench.action.closeActiveEditor');
           await commands.executeCommand("vscode.openWith",

yarn.lock

@@ -2221,10 +2221,10 @@
   resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.1.tgz#0bf2c9d57698b99be2bb2813272169f7f62eb714"
   integrity sha512-ghW5SfuDmsGDS2A4xkvGsLwDRNc3Vj5rS6rPOyPm/IryZuf3wceZKxgYaUoW+k9f0f/CB7y2c1rRsdOWZWn0PQ==
 
-"@types/vscode@1.66.0":
-  version "1.66.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.66.0.tgz#e90e1308ad103f2bd31b72c17b8031b4cec0713d"
-  integrity sha512-ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA==
+"@types/vscode@1.94.0":
+  version "1.94.0"
+  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.94.0.tgz#ccd2111b6ecaba6ad4da19c2d524828fa73ae250"
+  integrity sha512-UyQOIUT0pb14XSqJskYnRwD2aG0QrPVefIfrW1djR+/J4KeFQ0i1+hjZoaAmeNf3Z2jleK+R2hv+EboG/m8ruw==
 
 "@types/wcwidth@^1.0.0":
   version "1.0.0"