fix type issues

Author: arpitkuriyal

.gitignore

@@ -6,3 +6,4 @@ dist/
 scratch/
 TODO
 .DS_Store
+

language-server/src/services/configuration.js

@@ -11,31 +11,19 @@ import ignore from "ignore";
  * @typedef {{
  *   defaultDialect?: string;
  *   schemaFilePatterns: string[];
- *   detectIndentation: boolean;
- * }} DocumentSettings
- */
-
-/**
- * @typedef {{
- *   jsonSchemaLanguageServer?: DocumentSettings;
- * }} Settings
- */
-
-/**
- * @typedef {{
+ *   detectIndentation?: boolean;
  *   tabSize?: number;
  *   insertSpaces?: boolean;
- *   detectIndentation?: boolean;
- *   endOfLine?: string;
- * }} IndentationSettings
+ *   endOfLine: string;
+ * }} DocumentSettings
  */
 
+
 export class Configuration {
   #server;
 
   /** @type DocumentSettings | undefined */
   #settings;
-
   /** @type Partial<DocumentSettings> */
   #defaultSettings;
 
@@ -52,7 +40,8 @@ export class Configuration {
     this.#server = server;
 
     this.#defaultSettings = {
-      schemaFilePatterns: ["*.schema.json", "schema.json"]
+      schemaFilePatterns: ["*.schema.json", "schema.json"],
+      detectIndentation: true
     };
 
     let hasDidChangeConfigurationCapability = false;
@@ -93,13 +82,13 @@ export class Configuration {
         { section: "editor" },
         { section: "files.eol" }
       ]);
-      const [extensionSettings, editorSettings, eol] = /** @type [DocumentSettings, IndentationSettings, string] */ (config);
-      /** @type IndentationSettings */
+      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
+
       };
 
       const fullSettings = {

language-server/src/util/util.js

@@ -5,12 +5,13 @@ 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 { IndentationSettings } from "../services/configuration.js"
+ * @import { DocumentSettings} from "../services/configuration.js"
  * @import { SchemaNode as SchemaNodeType } from "../model/schema-node.js"
  */
 
@@ -114,7 +115,7 @@ export const readDirRecursive = async function* (path, filter, cwd) {
   }
 };
 
-/** @type (textDocument: TextDocument, textEdit: TextEdit, settings: IndentationSettings) => TextEdit */
+/** @type (textDocument: TextDocument, textEdit: TextEdit, settings: DocumentSettings) => TextEdit */
 export const withFormatting = (textDocument, textEdit, settings) => {
   const indentation = settings.detectIndentation ? detectIndent(textDocument.getText()) : {
     amount: settings.tabSize,
@@ -125,7 +126,7 @@ export const withFormatting = (textDocument, textEdit, settings) => {
     insertSpaces: indentation.type === "space",
     tabSize: indentation.amount,
     keepLines: true,
-    eol: settings.endOfLine
+    eol: settings.endOfLine == "auto" ? os.EOL : settings.endOfLine
   };
 
   const offset = textDocument.offsetAt(textEdit.range.start);