clean up for clarity

Author: isabelizimm

apps/vscode/src/main.ts

@@ -36,8 +36,6 @@ import { extensionHost } from "./host";
 import { configuredQuartoPath } from "./core/quarto";
 import { activateDenoConfig } from "./providers/deno-config";
 import { determineMode, setEditorOpener } from "./providers/editor/toggle";
-import { URI } from "vscode-languageserver-types";
-import { config } from "vscode-nls";
 
 let suppressOpenHandler = false;
 
@@ -139,24 +137,34 @@ export async function activate(context: vscode.ExtensionContext) {
       setEditorOpener();
     }
   });
-  // end if positron
 
   const documentOpenHandler = vscode.workspace.onDidOpenTextDocument(async (document: vscode.TextDocument) => {
     // Check if the document language is "quarto"
     const config = vscode.workspace.getConfiguration('quarto').get<string>('defaultEditor');
+    if (document.languageId != 'quarto') {
+      return;
+    }
     if (suppressOpenHandler) {
       suppressOpenHandler = false; // Reset the flag
-      return; // Prevent further execution
+      return;
     }
-    if (document.languageId === 'quarto') {
-      suppressOpenHandler = await determineMode(document, config);
-
+    const editorMode = await determineMode(document.getText());
+    if (editorMode && editorMode != config) {
+      suppressOpenHandler = true;
+      const editorOpener = editorMode === 'visual' ? VisualEditorProvider.viewType : 'textEditor';
+      await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+      await vscode.commands.executeCommand("vscode.openWith",
+        document.uri,
+        editorOpener
+      );
+      return;
     }
   });
 
   // Add the event handler to the context subscriptions
   context.subscriptions.push(documentOpenHandler);
 
+  // end if positron
 }
 
 export async function deactivate() {

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

@@ -14,42 +14,31 @@
  */
 import * as vscode from "vscode";
 import { commands, window, workspace, TextDocument, ViewColumn } from "vscode";
-import { Command } from "../../core/command";
-import { isQuartoDoc, kQuartoLanguageId } from "../../core/doc";
+import * as path from 'path';
 import * as quarto from "quarto-core";
 import fs from "node:fs";
-import * as path from 'path';
 import yaml from "js-yaml";
+import { Command } from "../../core/command";
+import { isQuartoDoc, kQuartoLanguageId } from "../../core/doc";
 import { VisualEditorProvider } from "./editor";
 
 
-export async function determineMode(doc: TextDocument, config: string | undefined): Promise<boolean> {
-  const text = doc.getText()
-
+export async function determineMode(doc: string): Promise<string | undefined> {
   let editorOpener = undefined;
 
   // check if file itself has a mode
-  if (hasEditorMode(text, "source")) {
+  if (hasEditorMode(doc, "source")) {
     editorOpener = "source";
   }
-  else if (hasEditorMode(text, "visual")) {
+  else if (hasEditorMode(doc, "visual")) {
     editorOpener = "visual";
   }
   // check if has a _quarto.yml or _quarto.yaml file with editor specified
   else {
     editorOpener = workspaceHasQuartoYaml();
   }
-  if (editorOpener && editorOpener != config) {
-    editorOpener = editorOpener === 'visual' ? VisualEditorProvider.viewType : 'textEditor';
-    await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
-    await vscode.commands.executeCommand("vscode.openWith",
-      doc.uri,
-      editorOpener
-    );
-    return true;
-  }
 
-  return false;
+  return editorOpener;
 }
 
 export async function setEditorOpener() {