Configuration cleanup

Author: jdesrosiers

language-server/src/services/configuration.js

@@ -1,5 +1,6 @@
 import { DidChangeConfigurationNotification } from "vscode-languageserver";
 import ignore from "ignore";
+import { pick } from "../util/util.js";
 
 /**
  * @import { DidChangeConfigurationParams, NotificationHandler } from "vscode-languageserver"
@@ -11,20 +12,42 @@ import ignore from "ignore";
  * @typedef {{
  *   defaultDialect?: string;
  *   schemaFilePatterns: string[];
- *   detectIndentation?: boolean;
+ * }} LanguageServerSettings
+ */
+
+/**
+ * @typedef {{
  *   tabSize?: number;
  *   insertSpaces?: boolean;
- *   endOfLine: string;
- * }} DocumentSettings
+ *   detectIndentation: boolean;
+ * }} EditorSettings
+ */
+
+/**
+ * @typedef {{
+ *   eol?: string;
+ * }} FilesSettings
+ */
+
+/**
+ * @typedef {LanguageServerSettings & EditorSettings & FilesSettings} DocumentSettings
  */
 
+/**
+ * @typedef {[
+ *   Partial<LanguageServerSettings> | null,
+ *   Partial<EditorSettings> | null,
+ *   Partial<FilesSettings> | null
+ * ]} Settings
+ */
 
 export class Configuration {
   #server;
 
   /** @type DocumentSettings | undefined */
   #settings;
-  /** @type Partial<DocumentSettings> */
+
+  /** @type DocumentSettings */
   #defaultSettings;
 
   /** @type ((uri: string) => boolean) | undefined */
@@ -76,32 +99,22 @@ export class Configuration {
   /** @type () => Promise<DocumentSettings> */
   async get() {
     if (!this.#settings) {
-      /** @type {unknown[]} */
-      const config = await this.#server.workspace.getConfiguration([
+      const settings = /** @type Settings */ (await this.#server.workspace.getConfiguration([
         { section: "jsonSchemaLanguageServer" },
         { section: "editor" },
-        { section: "files.eol" }
-      ]);
-      const [extensionSettings, editorSettings, eol] = /** @type [Partial<DocumentSettings> | null, Partial<DocumentSettings> | null, string | null] */ (config);
-      const indentationSettings = {
-        tabSize: editorSettings?.tabSize,
-        insertSpaces: editorSettings?.insertSpaces,
-        detectIndentation: editorSettings?.detectIndentation ?? this.#defaultSettings.detectIndentation,
-        endOfLine: eol
+        { section: "files" }
+      ]));
+      const [languageServerSettings, editorSettings, filesSettings] = settings;
 
-      };
-
-      const fullSettings = {
+      this.#settings = {
         ...this.#defaultSettings,
-        ...extensionSettings,
-        ...indentationSettings
+        ...languageServerSettings,
+        ...pick(editorSettings ?? {}, "tabSize", "insertSpaces", "detectIndentation"),
+        ...pick(filesSettings ?? {}, "eol")
       };
-
-      this.#settings = /** @type DocumentSettings */ (fullSettings);
-      this.#matcher = undefined;
     }
 
-    return /** @type DocumentSettings */ (this.#settings);
+    return this.#settings;
   }
 
   /** @type (uri: string) => Promise<boolean> */

language-server/src/util/util.js

@@ -1,17 +1,17 @@
 import { getKeywordId, getKeywordName } from "@hyperjump/json-schema/experimental";
 import { resolveIri as hyperjumpResolveIri } from "@hyperjump/uri";
 import { readdir } from "node:fs/promises";
+import { EOL } from "node:os";
 import { join, relative } from "node:path";
 import { URI } from "vscode-uri";
 import detectIndent from "detect-indent";
 import * as jsoncParser from "jsonc-parser";
-import os from "os";
 
 /**
  * @import { TextEdit } from "vscode-languageserver"
  * @import { TextDocument } from "vscode-languageserver-textdocument"
  * @import { Ignore } from "ignore"
- * @import { DocumentSettings} from "../services/configuration.js"
+ * @import { DocumentSettings } from "../services/configuration.js"
  * @import { SchemaNode as SchemaNodeType } from "../model/schema-node.js"
  */
 
@@ -126,7 +126,7 @@ export const withFormatting = (textDocument, textEdit, settings) => {
     insertSpaces: indentation.type === "space",
     tabSize: indentation.amount,
     keepLines: true,
-    eol: settings.endOfLine == "auto" ? os.EOL : settings.endOfLine
+    eol: settings.eol == "auto" ? EOL : settings.eol
   };
 
   const offset = textDocument.offsetAt(textEdit.range.start);
@@ -151,3 +151,15 @@ export const withFormatting = (textDocument, textEdit, settings) => {
     newText: jsoncParser.applyEdits(textEdit.newText, formatEdits)
   };
 };
+
+// eslint-disable-next-line @stylistic/no-extra-parens
+export const pick = /** @type <T extends object, K extends keyof T>(object: T, ...keys: K[]) => Partial<Pick<T, K>> */ ((object, ...keys) => {
+  /** @type Partial<typeof object> */
+  const result = {};
+  for (const key of keys) {
+    if (key in object) {
+      result[key] = object[key];
+    }
+  }
+  return result;
+});