Remove state file and comment on save

package.json

@@ -2,7 +2,7 @@
     "name": "andreas-talon",
     "displayName": "Andreas Talon",
     "description": "VSCode extension used by Talon Voice",
-    "version": "3.67.0",
+    "version": "3.68.0",
     "publisher": "AndreasArvidsson",
     "license": "MIT",
     "main": "./out/extension.js",

src/commands/formatComments/formatComments.ts

@@ -1,6 +1,5 @@
 import * as prettier from "prettier";
 import * as vscode from "vscode";
-import { getConfiguration } from "../../util/configuration";
 import { getActiveEditor } from "../../util/getActiveEditor";
 import { isTesting } from "../../util/isTesting";
 import { JavaFormatter } from "./JavaFormatter";
@@ -98,7 +97,7 @@ async function getLineWidth(document: vscode.TextDocument): Promise<number> {
         return prettierConfig.printWidth;
     }
 
-    const defaultFormatter = getConfiguration(document, "editor", "defaultFormatter");
+    const defaultFormatter = getConfiguration("editor", "defaultFormatter");
 
     switch (defaultFormatter) {
         case "ms-python.black-formatter":
@@ -108,3 +107,7 @@ async function getLineWidth(document: vscode.TextDocument): Promise<number> {
 
     return 80;
 }
+
+function getConfiguration<T>(section: string, key: string): T | undefined {
+    return vscode.workspace.getConfiguration(section).get<T>(key);
+}

src/extension.ts

@@ -1,11 +1,9 @@
 import * as vscode from "vscode";
-import { registerFormatCommentsOnSave } from "./commands/formatComments/registerFormatCommentsOnSave";
 import { registerCommands } from "./commands/registerCommands";
 import { registerLanguageCodeActions } from "./language/registerLanguageCodeActions";
 import { registerLanguageCompletionProviders } from "./language/registerLanguageCompletionProviders";
 import { registerLanguageDefinitions } from "./language/registerLanguageDefinitions";
 import { registerLanguageFormatters } from "./language/registerLanguageFormatters";
-import { registerStateUpdater } from "./stateUpdater";
 import { createTabView } from "./tabView";
 import { TreeSitter } from "./treeSitter/TreeSitter";
 import { getCommandServerExtension, getParseTreeExtension } from "./util/getExtension";
@@ -40,8 +38,6 @@ async function activateExtension(context: vscode.ExtensionContext): Promise<void
         registerLanguageCompletionProviders(),
         registerLanguageCodeActions(treeSitter),
         registerLanguageFormatters(treeSitter),
-        registerFormatCommentsOnSave(),
-        createTabView(),
-        isTesting ? vscode.Disposable.from() : registerStateUpdater()
+        createTabView()
     );
 }

src/language/SnippetFormatter.ts

@@ -1,10 +1,8 @@
 import { parseSnippetFile, serializeSnippetFile } from "talon-snippets";
-import type { TextDocument } from "vscode";
 import type { LanguageFormatterText } from "./registerLanguageFormatters";
 
 export const snippetFormatter: LanguageFormatterText = {
-    getText(document: TextDocument, _indentation: string): string {
-        const text = document.getText();
+    getText(text: string, _indentation: string): string {
         const documents = parseSnippetFile(text);
         return serializeSnippetFile(documents);
     }

src/language/TalonFormatter.ts

@@ -1,11 +1,10 @@
-import type { TextDocument } from "vscode";
 import type { SyntaxNode } from "web-tree-sitter";
 import { configuration } from "../util/configuration";
 import type { LanguageFormatterTree } from "./registerLanguageFormatters";
 
 export const talonFormatter: LanguageFormatterTree = {
-    getText(document: TextDocument, node: SyntaxNode, indentation: string): string {
-        const columnWidth = getColumnWidth(document, node.text);
+    getText(node: SyntaxNode, indentation: string): string {
+        const columnWidth = getColumnWidth(node.text);
         const formatter = new TalonFormatter(indentation, columnWidth);
         return formatter.getText(node);
     }
@@ -175,10 +174,10 @@ class TalonFormatter {
     }
 }
 
-function getColumnWidth(document: TextDocument, text: string) {
+function getColumnWidth(text: string) {
     const match = text.match(/# fmt: columnWidth=(\d+)/);
     if (match != null) {
         return parseInt(match[1]);
     }
-    return configuration.talonFormatter.columnWidth(document);
+    return configuration.talonFormatter.columnWidth();
 }

src/language/TalonListFormatter.ts

@@ -1,12 +1,10 @@
-import type { TextDocument } from "vscode";
 import { configuration } from "../util/configuration";
 import type { LanguageFormatterText } from "./registerLanguageFormatters";
 import { parseTalonList } from "./TalonListParser";
 
 export const talonListFormatter: LanguageFormatterText = {
-    getText(document: TextDocument, _indentation: string): string {
-        const text = document.getText();
-        const columnWidth = getColumnWidth(document, text);
+    getText(text: string, _indentation: string): string {
+        const columnWidth = getColumnWidth(text);
         const talonList = parseTalonList(text);
         talonList.headers.sort((a, _b) => (a.type === "header" && a.key === "list" ? -1 : 0));
         const result: string[] = [];
@@ -45,10 +43,10 @@ export const talonListFormatter: LanguageFormatterText = {
     }
 };
 
-function getColumnWidth(document: TextDocument, text: string) {
+function getColumnWidth(text: string) {
     const match = text.match(/# fmt: columnWidth=(\d+)/);
     if (match != null) {
         return parseInt(match[1]);
     }
-    return configuration.talonListFormatter.columnWidth(document);
+    return configuration.talonListFormatter.columnWidth();
 }

src/language/TreeSitterFormatter.ts

@@ -1,9 +1,8 @@
-import type { TextDocument } from "vscode";
 import type { SyntaxNode } from "web-tree-sitter";
 import type { LanguageFormatterTree } from "./registerLanguageFormatters";
 
 export const treeSitterFormatter: LanguageFormatterTree = {
-    getText(document: TextDocument, node: SyntaxNode, indentation: string): string {
+    getText(node: SyntaxNode, indentation: string): string {
         const formatter = new TreeSitterFormatter(indentation);
         return formatter.getText(node);
     }

src/language/registerLanguageFormatters.ts

@@ -9,11 +9,11 @@ import { talonListFormatter } from "./TalonListFormatter";
 import { treeSitterFormatter } from "./TreeSitterFormatter";
 
 export interface LanguageFormatterTree {
-    getText(document: TextDocument, node: SyntaxNode, indentation: string): string;
+    getText(node: SyntaxNode, indentation: string): string;
 }
 
 export interface LanguageFormatterText {
-    getText(document: TextDocument, indentation: string): string;
+    getText(text: string, indentation: string): string;
 }
 
 function provideDocumentFormattingEditsForTree(
@@ -33,7 +33,7 @@ function provideDocumentFormattingEditsForTree(
             }
 
             const { indentation } = await parseOptions(document, options);
-            const newText = formatter.getText(document, rootNode, indentation);
+            const newText = formatter.getText(rootNode, indentation);
             return createTextEdits(document, newText);
         }
     };
@@ -47,7 +47,7 @@ function provideDocumentFormattingEditsForText(formatter: LanguageFormatterText)
         ): Promise<TextEdit[]> => {
             const { indentation } = await parseOptions(document, options);
             try {
-                const newText = formatter.getText(document, indentation);
+                const newText = formatter.getText(document.getText(), indentation);
                 return createTextEdits(document, newText);
             } catch (error) {
                 console.warn((error as Error).message);

src/util/configuration.ts

@@ -1,21 +1,18 @@
-import type { TextDocument } from "vscode";
 import { workspace } from "vscode";
 import { isTesting } from "./isTesting";
 
 interface Configuration {
-    formatCommentsOnSave: (document: TextDocument) => boolean;
     talonFormatter: {
-        columnWidth: (document: TextDocument) => number | undefined;
+        columnWidth: () => number | undefined;
     };
     talonListFormatter: {
-        columnWidth: (document: TextDocument) => number | undefined;
+        columnWidth: () => number | undefined;
     };
 }
 
 export const configuration: Configuration = (() => {
     if (isTesting) {
         return {
-            formatCommentsOnSave: () => false,
             talonFormatter: {
                 columnWidth: () => 28
             },
@@ -26,43 +23,19 @@ export const configuration: Configuration = (() => {
     }
 
     return {
-        formatCommentsOnSave: (document) => {
-            return getMyConfiguration<boolean>(document, "formatCommentsOnSave") ?? false;
-        },
         talonFormatter: {
-            columnWidth: (document) => {
-                return getMyConfiguration<number>(document, "talonFormatter.columnWidth");
+            columnWidth: () => {
+                return getConfiguration<number>("talonFormatter.columnWidth");
             }
         },
         talonListFormatter: {
-            columnWidth: (document) => {
-                return getMyConfiguration<number>(document, "talonListFormatter.columnWidth");
+            columnWidth: () => {
+                return getConfiguration<number>("talonListFormatter.columnWidth");
             }
         }
     };
 })();
 
-function getMyConfiguration<T>(document: TextDocument, key: string): T | undefined {
-    return getConfiguration(document, "andreas", key);
-}
-
-export function getConfiguration<T>(
-    document: TextDocument,
-    section: string,
-    key: string
-): T | undefined {
-    return (
-        getLanguageConfiguration(document, section, key) ??
-        workspace.getConfiguration(section).get<T>(key)
-    );
-}
-
-function getLanguageConfiguration<T>(
-    document: TextDocument,
-    section: string,
-    key: string
-): T | undefined {
-    const langConfig = workspace.getConfiguration(`[${document.languageId}]`);
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
-    return (langConfig as any)[`${section}.${key}`];
+function getConfiguration<T>(key: string): T | undefined {
+    return workspace.getConfiguration("andreas").get<T>(key);
 }