Optimize handler

Author: apexskier

rollup.config.main.js

@@ -1,6 +1,6 @@
-import typescript from "rollup-plugin-typescript2";
 import commonjs from "@rollup/plugin-commonjs";
 import resolve from "@rollup/plugin-node-resolve";
+import typescript from "rollup-plugin-typescript2";
 
 export default {
   input: "src/main.ts",

src/main.test.ts

@@ -7,9 +7,6 @@ jest.mock("./tsLibPath", () => ({
 jest.mock("./isEnabledForJavascript", () => ({
   isEnabledForJavascript: () => true,
 }));
-jest.mock("./shouldOrganizeImportsOnSave", () => ({
-  shouldOrganizeImportsOnSave: jest.fn(() => true),
-}));
 jest.mock("nova-extension-utils");
 
 jest.useFakeTimers();
@@ -303,6 +300,9 @@ describe("test suite", () => {
 
       await activate();
 
+      (nova as any).config = { onDidChange: jest.fn() };
+      (nova as any).workspace.config = { onDidChange: jest.fn() };
+
       expect(nova.workspace.onDidAddTextEditor).toBeCalledTimes(1);
       const setupWatcher = (nova.workspace.onDidAddTextEditor as jest.Mock).mock
         .calls[0][0];
@@ -311,30 +311,25 @@ describe("test suite", () => {
         onDidDestroy: jest.fn(),
         document: {
           syntax: "typescript",
+          onDidChangeSyntax: jest.fn(),
         },
       };
       setupWatcher(mockEditor);
+      expect(mockEditor.onWillSave).toBeCalledTimes(0);
+
+      require("nova-extension-utils").preferences.getOverridableBoolean.mockReturnValue(
+        true
+      );
+      setupWatcher(mockEditor);
       expect(mockEditor.onWillSave).toBeCalledTimes(1);
+
       const saveHandler = (mockEditor.onWillSave as jest.Mock).mock.calls[0][0];
       await saveHandler(mockEditor);
       expect(nova.commands.invoke).toHaveBeenNthCalledWith(
         1,
         "apexskier.typescript.commands.organizeImports",
         mockEditor
       );
-
-      (nova.commands.invoke as jest.Mock).mockReset();
-      mockEditor.document.syntax = "__something_else__";
-      await saveHandler(mockEditor);
-      expect(nova.commands.invoke).not.toBeCalled();
-
-      (nova.commands.invoke as jest.Mock).mockReset();
-      mockEditor.document.syntax = "typescript";
-      require("./shouldOrganizeImportsOnSave").shouldOrganizeImportsOnSave.mockReturnValue(
-        false
-      );
-      await saveHandler(mockEditor);
-      expect(nova.commands.invoke).not.toBeCalled();
     });
   });
 });

src/main.ts

@@ -1,4 +1,4 @@
-import { dependencyManagement } from "nova-extension-utils";
+import { dependencyManagement, preferences } from "nova-extension-utils";
 import { registerFindReferences } from "./commands/findReferences";
 import { registerFindSymbol } from "./commands/findSymbol";
 import { registerOrganizeImports } from "./commands/organizeImports";
@@ -7,9 +7,11 @@ import { registerSignatureHelp } from "./commands/signatureHelp";
 import { InformationView } from "./informationView";
 import { isEnabledForJavascript } from "./isEnabledForJavascript";
 import { wrapCommand } from "./novaUtils";
-import { shouldOrganizeImportsOnSave } from "./shouldOrganizeImportsOnSave";
 import { getTsLibPath } from "./tsLibPath";
 
+const organizeImportsOnSaveKey =
+  "apexskier.typescript.config.organizeImportsOnSave";
+
 nova.commands.register(
   "apexskier.typescript.openWorkspaceConfig",
   wrapCommand(function openWorkspaceConfig(workspace: Workspace) {
@@ -189,21 +191,53 @@ async function asyncActivate() {
 
   client.start();
 
+  // auto-organize imports on save
   compositeDisposable.add(
     nova.workspace.onDidAddTextEditor((editor) => {
-      const listener = editor.onWillSave(async (editor) => {
+      const editorDisposable = new CompositeDisposable();
+      compositeDisposable.add(editorDisposable);
+      compositeDisposable.add(
+        editor.onDidDestroy(() => editorDisposable.dispose())
+      );
+
+      // watch things that might change if this needs to happen or not
+      editorDisposable.add(editor.document.onDidChangeSyntax(refreshListener));
+      editorDisposable.add(
+        nova.config.onDidChange(organizeImportsOnSaveKey, refreshListener)
+      );
+      editorDisposable.add(
+        nova.workspace.config.onDidChange(
+          organizeImportsOnSaveKey,
+          refreshListener
+        )
+      );
+      
+      let willSaveListener = setupListener();
+      compositeDisposable.add({
+        dispose() {
+          willSaveListener?.dispose();
+        },
+      });
+
+      function refreshListener() {
+        willSaveListener?.dispose();
+        willSaveListener = setupListener();
+      }
+
+      function setupListener() {
         if (
-          editor.document.syntax &&
-          syntaxes.includes(editor.document.syntax) &&
-          shouldOrganizeImportsOnSave()
+          (syntaxes as Array<string | null>).includes(editor.document.syntax) &&
+          preferences.getOverridableBoolean(organizeImportsOnSaveKey)
         ) {
-          await nova.commands.invoke(
-            "apexskier.typescript.commands.organizeImports",
-            editor
+          return editor.onWillSave(async (editor) =>
+            nova.commands.invoke(
+              "apexskier.typescript.commands.organizeImports",
+              editor
+            )
           );
         }
-      });
-      compositeDisposable.add(editor.onDidDestroy(() => listener.dispose()));
+        return null;
+      }
     })
   );