track editor associations

Author: isabelizimm

apps/vscode/src/main.ts

@@ -35,8 +35,7 @@ import { activateZotero } from "./providers/zotero/zotero";;
 import { extensionHost } from "./host";
 import { configuredQuartoPath } from "./core/quarto";
 import { activateDenoConfig } from "./providers/deno-config";
-import { setEditorOpener } from "./providers/editor/toggle";
-import { hasHooks } from "./host/hooks";
+import { defaultEditorOpener } from "./providers/editor/configurations"
 
 export async function activate(context: vscode.ExtensionContext) {
 
@@ -128,16 +127,9 @@ 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();
-    const defaultEditor = vscode.workspace.onDidChangeConfiguration(async (event) => {
-      if (event.affectsConfiguration('quarto.defaultEditor')) {
-        setEditorOpener();
-      }
-    });
-    context.subscriptions.push(defaultEditor);
-  }
+  context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async () => {
+    defaultEditorOpener()
+  }));
 }
 
 export async function deactivate() {

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

@@ -0,0 +1,28 @@
+/*
+ * configurations.ts
+ *
+ * Copyright (C) 2022 by Posit Software, PBC
+ *
+ * Unless you have received this program directly from Posit Software pursuant
+ * to the terms of a commercial license agreement with Posit Software, then
+ * this program is licensed to you under the terms of version 3 of the
+ * GNU Affero General Public License. This program is distributed WITHOUT
+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
+ *
+ */
+
+import * as vscode from "vscode";
+
+export function defaultEditorOpener(): string | undefined {
+  const target = 'workbench.editorAssociations';
+
+  const inspectType = vscode.workspace.getConfiguration(undefined).inspect(target)?.globalValue;
+  if (!inspectType) { return "textEditor"; }
+
+  if (inspectType.hasOwnProperty("*.qmd")) {
+    return inspectType["*.qmd"]
+  }
+  return "textEditor"
+}

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

@@ -12,12 +12,9 @@
  * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
  *
  */
-import * as vscode from "vscode";
+
 import { commands, window, workspace, TextDocument, ViewColumn } from "vscode";
-import * as path from 'path';
 import * as quarto from "quarto-core";
-import fs from "node:fs";
-import yaml from "js-yaml";
 import { Command } from "../../core/command";
 import { isQuartoDoc, kQuartoLanguageId } from "../../core/doc";
 import { VisualEditorProvider } from "./editor";
@@ -27,10 +24,10 @@ export function determineMode(doc: TextDocument): string | undefined {
   const text = doc.getText();
   // check if file itself has a mode
   if (hasEditorMode(text, "source")) {
-    editorOpener = "source";
+    editorOpener = "textEditor";
   }
   else if (hasEditorMode(text, "visual")) {
-    editorOpener = "visual";
+    editorOpener = VisualEditorProvider.viewType;
   }
   // check if has a _quarto.yml or _quarto.yaml file with editor specified
   else {
@@ -40,16 +37,6 @@ export function determineMode(doc: TextDocument): string | undefined {
   return editorOpener;
 }
 
-export async function setEditorOpener() {
-  const config = vscode.workspace.getConfiguration('quarto').get<string>('defaultEditor');
-  const viewType = config === 'visual' ? VisualEditorProvider.viewType : 'textEditor';
-
-  await vscode.commands.executeCommand("workbench.action.setDefaultEditor",
-    '*.qmd',
-    viewType
-  );
-}
-
 export function modeFromQuartoYaml(doc: TextDocument): string | undefined {
   const metadataFiles = quarto.metadataFilesForDocument(doc.uri.fsPath);
   if (!metadataFiles) {
@@ -58,8 +45,11 @@ export function modeFromQuartoYaml(doc: TextDocument): string | undefined {
   if (metadataFiles) {
     for (const metadataFile of metadataFiles) {
       const yamlText = quarto.yamlFromMetadataFile(metadataFile);
-      if (yamlText?.editor === "source" || yamlText?.editor === "visual") {
-        return yamlText?.editor;
+      if (yamlText?.editor === "source") {
+        return "textEditor"
+      }
+      if (yamlText?.editor === "visual") {
+        return VisualEditorProvider.viewType;
       }
     }
   }