do some clean up

Author: arpitkuriyal

language-server/src/services/configuration.js

@@ -11,10 +11,7 @@ import ignore from "ignore";
  * @typedef {{
  *   defaultDialect?: string;
  *   schemaFilePatterns: string[];
- *   tabSize: number;
- *   insertSpaces: boolean;
  *   detectIndentation: boolean;
- *   endOfLine: string;
  * }} DocumentSettings
  */
 
@@ -24,6 +21,15 @@ import ignore from "ignore";
  * }} Settings
  */
 
+/**
+ * @typedef {{
+ *   tabSize?: number;
+ *   insertSpaces?: boolean;
+ *   detectIndentation?: boolean;
+ *   endOfLine?: string;
+ * }} IndentationSettings
+ */
+
 export class Configuration {
   #server;
 
@@ -68,7 +74,15 @@ export class Configuration {
     this.#didChangeConfigurationHandlers = [];
 
     this.#server.onDidChangeConfiguration((params) => {
-      this.#settings = undefined;
+      /** @type unknown */
+      const settings = params.settings;
+
+      /** @type unknown */
+      const fullSettings = {
+        ...this.#defaultSettings,
+        .../** @type Settings */(settings).jsonSchemaLanguageServer
+      };
+      this.#settings = /** @type DocumentSettings */ (fullSettings);
       this.#matcher = undefined;
 
       for (const handler of this.#didChangeConfigurationHandlers) {
@@ -77,20 +91,20 @@ export class Configuration {
     });
   }
 
-  /** @type (documentUri?: string) => Promise<DocumentSettings> */
-  async get(documentUri) {
+  /** @type () => Promise<DocumentSettings> */
+  async get() {
     if (!this.#settings) {
       /** @type {unknown[]} */
       const config = await this.#server.workspace.getConfiguration([
         { section: "jsonSchemaLanguageServer" },
-        { section: "editor", scopeUri: documentUri },
+        { section: "editor" },
         { section: "files.eol" }
       ]);
-      const [extensionSettings, editorSettings, eol] = /** @type [{ defaultDialect?: string; schemaFilePatterns?: string[] },{ tabSize?: number; insertSpaces?: boolean; detectIndentation?: boolean }, string ] */ (config);
-      /** @type {{ tabSize?: number; insertSpaces?: boolean; detectIndentation?: boolean, endOfLine?: string }} */
+      const [extensionSettings, editorSettings, eol] = /** @type [DocumentSettings, IndentationSettings, string] */ (config);
+      /** @type IndentationSettings */
       const indentationSettings = {
-        tabSize: editorSettings?.tabSize ?? this.#defaultSettings.tabSize,
-        insertSpaces: editorSettings?.insertSpaces ?? this.#defaultSettings.insertSpaces,
+        tabSize: editorSettings?.tabSize,
+        insertSpaces: editorSettings?.insertSpaces,
         detectIndentation: editorSettings?.detectIndentation ?? this.#defaultSettings.detectIndentation,
         endOfLine: eol
       };

language-server/src/util/util.js

@@ -10,7 +10,7 @@ import * as jsoncParser from "jsonc-parser";
  * @import { TextEdit } from "vscode-languageserver"
  * @import { TextDocument } from "vscode-languageserver-textdocument"
  * @import { Ignore } from "ignore"
- * @import { DocumentSettings } from "../services/configuration.js"
+ * @import { IndentationSettings } from "../services/configuration.js"
  * @import { SchemaNode as SchemaNodeType } from "../model/schema-node.js"
  */
 
@@ -114,7 +114,7 @@ export const readDirRecursive = async function* (path, filter, cwd) {
   }
 };
 
-/** @type (textDocument: TextDocument, textEdit: TextEdit, settings: DocumentSettings) => TextEdit */
+/** @type (textDocument: TextDocument, textEdit: TextEdit, settings: IndentationSettings) => TextEdit */
 export const withFormatting = (textDocument, textEdit, settings) => {
   const indentation = settings.detectIndentation ? detectIndent(textDocument.getText()) : {
     amount: settings.tabSize,