refactor: collect file state into an object

Author: Myriad-Dreamin

editors/vscode/src/extension.ts

@@ -152,11 +152,11 @@ async function languageActivate(context: IContext) {
   // Find first document to focus
   const editor = window.activeTextEditor;
   if (isTypstDocument(editor?.document)) {
-    commandActivateDoc(editor.document);
+    focusDocPath(editor.document);
   } else {
     window.visibleTextEditors.forEach((editor) => {
       if (isTypstDocument(editor.document)) {
-        commandActivateDoc(editor.document);
+        focusDocPath(editor.document);
       }
     });
   }
@@ -172,27 +172,26 @@ async function languageActivate(context: IContext) {
       // }
       if (!isTypstDocument(editor?.document)) {
         // console.log("not typst", langId, editor?.document.uri.fsPath);
-        return commandActivateDoc(undefined);
+        return focusDocPath(undefined);
       }
-      return commandActivateDoc(editor?.document);
+      return focusDocPath(editor?.document);
     }),
   );
   context.subscriptions.push(
     vscode.workspace.onDidOpenTextDocument((doc: vscode.TextDocument) => {
       if (doc.isUntitled && window.activeTextEditor?.document === doc) {
         if (isTypstDocument(doc)) {
-          return commandActivateDocPath(doc, "/untitled/" + doc.uri.fsPath);
+          return focusDocPath(doc);
         } else {
-          return commandActivateDoc(undefined);
+          return focusDocPath(undefined);
         }
       }
     }),
   );
   context.subscriptions.push(
     vscode.workspace.onDidCloseTextDocument((doc: vscode.TextDocument) => {
-      if (extensionState.mut.focusingDoc === doc) {
-        extensionState.mut.focusingDoc = undefined;
-        commandActivateDoc(undefined);
+      if (extensionState.mut.focusing.doc === doc) {
+        focusDocPath(undefined);
       }
     }),
   );
@@ -245,6 +244,24 @@ async function openExternal(target: string): Promise<void> {
   await vscode.env.openExternal(uri);
 }
 
+function focusDocPath(doc: vscode.TextDocument | undefined) {
+  const fsPath = doc
+    ? doc.isUntitled
+      ? "/untitled/" + doc.uri.fsPath
+      : doc.uri.fsPath
+    : undefined;
+
+  // Changes focus state.
+  extensionState.mut.focusing.focusMain(doc, fsPath);
+
+  // Changes status bar.
+  const formatString = statusBarFormatString();
+  triggerStatusBar(
+    // Shows the status bar only the last focusing file is not closed (opened)
+    !!formatString && !!(fsPath || extensionState.mut.focusing.doc?.isClosed === false),
+  );
+}
+
 async function commandGetCurrentDocumentMetrics(): Promise<any> {
   const activeEditor = window.activeTextEditor;
   if (activeEditor === undefined) {
@@ -507,34 +524,6 @@ async function initTemplate(context: vscode.ExtensionContext, inPlace: boolean,
   }
 }
 
-function commandActivateDoc(doc: vscode.TextDocument | undefined) {
-  commandActivateDocPath(doc, doc?.uri.fsPath);
-}
-
-let focusMainTimeout: NodeJS.Timeout | undefined = undefined;
-function commandActivateDocPath(doc: vscode.TextDocument | undefined, fsPath: string | undefined) {
-  // console.log("focus main", fsPath, new Error().stack);
-  extensionState.mut.focusingFile = fsPath;
-  if (fsPath) {
-    extensionState.mut.focusingDoc = doc;
-  }
-  if (extensionState.mut.focusingDoc?.isClosed) {
-    extensionState.mut.focusingDoc = undefined;
-  }
-  const formatString = statusBarFormatString();
-  // remove the status bar until the last focusing file is closed
-  triggerStatusBar(
-    !!formatString && !!(fsPath || extensionState.mut.focusingDoc?.isClosed === false),
-  );
-
-  if (focusMainTimeout) {
-    clearTimeout(focusMainTimeout);
-  }
-  focusMainTimeout = setTimeout(() => {
-    tinymist.executeCommand("tinymist.focusMain", [fsPath]);
-  }, 100);
-}
-
 async function commandRunCodeLens(...args: string[]): Promise<void> {
   if (args.length === 0) {
     return;

editors/vscode/src/focus.ts

@@ -0,0 +1,38 @@
+import { tinymist } from "./lsp";
+import * as vscode from "vscode";
+
+export class FocusState {
+  private mainTimeout: NodeJS.Timeout | undefined = undefined;
+  private mainPath: string | undefined = undefined;
+  private mainDoc: vscode.TextDocument | undefined = undefined;
+
+  reset() {
+    if (this.mainTimeout) {
+      clearTimeout(this.mainTimeout);
+    }
+  }
+
+  // Informs the server after a while. This is not done intemediately to avoid
+  // the cases that the user removes the file from the editor and then opens
+  // another one in a short time.
+  focusMain(doc?: vscode.TextDocument, fsPath?: string) {
+    if (this.mainTimeout) {
+      clearTimeout(this.mainTimeout);
+    }
+    this.mainDoc = doc;
+    if (this.mainDoc?.isClosed) {
+      this.mainDoc = undefined;
+    }
+    this.mainPath = fsPath;
+    this.mainTimeout = setTimeout(async () => {
+      tinymist.executeCommand("tinymist.focusMain", [fsPath]);
+    }, 100);
+  }
+
+  get path() {
+    return this.mainPath;
+  }
+  get doc() {
+    return this.mainDoc;
+  }
+}

editors/vscode/src/state.ts

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import { PreviewPanelContext } from "./features/preview";
+import { FocusState } from "./focus";
 
 export type ExtensionContext = vscode.ExtensionContext;
 
@@ -24,12 +25,9 @@ interface ExtensionState {
     renderDocs: boolean;
   };
   mut: {
-    focusingFile: string | undefined;
-    focusingDoc: vscode.TextDocument | undefined;
+    focusing: FocusState;
     focusingPreviewPanelContext: PreviewPanelContext | undefined;
   };
-  getFocusingFile(): string | undefined;
-  getFocusingDoc(): vscode.TextDocument | undefined;
   getFocusingPreviewPanelContext(): PreviewPanelContext | undefined;
 }
 
@@ -54,16 +52,9 @@ export const extensionState: ExtensionState = {
     renderDocs: false,
   },
   mut: {
-    focusingFile: undefined,
-    focusingDoc: undefined,
+    focusing: new FocusState(),
     focusingPreviewPanelContext: undefined,
   },
-  getFocusingFile() {
-    return extensionState.mut.focusingFile;
-  },
-  getFocusingDoc() {
-    return extensionState.mut.focusingDoc;
-  },
   getFocusingPreviewPanelContext() {
     return extensionState.mut.focusingPreviewPanelContext;
   },