undo import

Author: jderochervlk

server/src/server.ts

@@ -1,40 +1,34 @@
-import process from "process";
-import * as p from "vscode-languageserver-protocol";
-import * as v from "vscode-languageserver";
-import * as rpc from "vscode-jsonrpc/node";
-import * as path from "path";
-import semver from "semver";
 import fs from "fs";
 import fsAsync from "fs/promises";
+import * as path from "path";
+import process from "process";
+import semver from "semver";
+import * as rpc from "vscode-jsonrpc/node";
+import * as v from "vscode-languageserver";
+import { WorkspaceEdit } from "vscode-languageserver";
+import * as p from "vscode-languageserver-protocol";
 import {
-  DidChangeWatchedFilesNotification,
-  DidOpenTextDocumentNotification,
+  CodeLensParams,
+  DidChangeConfigurationNotification,
   DidChangeTextDocumentNotification,
+  DidChangeWatchedFilesNotification,
   DidCloseTextDocumentNotification,
-  DidChangeConfigurationNotification,
+  DidOpenTextDocumentNotification,
+  InitializedNotification,
   InitializeParams,
   InlayHintParams,
-  CodeLensParams,
   SignatureHelpParams,
-  InitializedNotification,
 } from "vscode-languageserver-protocol";
-import * as lookup from "./lookup";
-import * as utils from "./utils";
 import * as codeActions from "./codeActions";
+import config, { extensionConfiguration, initialConfiguration } from "./config";
 import * as c from "./constants";
-import { assert } from "console";
-import { WorkspaceEdit } from "vscode-languageserver";
 import { onErrorReported } from "./errorReporter";
 import * as ic from "./incrementalCompilation";
-import config, { extensionConfiguration, initialConfiguration } from "./config";
+import { getLogger, initializeLogger, setLogLevel } from "./logger";
+import * as lookup from "./lookup";
 import { projectsFiles } from "./projectFiles";
+import * as utils from "./utils";
 import { NormalizedPath } from "./utils";
-import { initializeLogger, getLogger, setLogLevel } from "./logger";
-
-function applyUserConfiguration(configuration: extensionConfiguration) {
-  // We always want to spread the initial configuration to ensure all defaults are respected.
-  config.extensionConfiguration = Object.assign(
-    {},
     initialConfiguration,
     configuration,
   );
@@ -1523,41 +1517,35 @@ async function onMessage(msg: p.Message) {
       The client can watch files for us and send us events via the `workspace/didChangeWatchedFiles`
       */
       const watchers = Array.from(workspaceFolders).flatMap(
-        (projectRootPath) => {
-          return [
-            {
-              // Only watch the root compiler log for each workspace folder.
-              // In monorepos, `**/lib/bs/.compiler.log` matches every package and dependency,
-              // causing a burst of events per save.
-              globPattern: {
-                baseUri: utils.pathToURI(projectRootPath),
-                pattern: c.compilerLogPartialPath,
-              },
-              kind:
-                p.WatchKind.Change | p.WatchKind.Create | p.WatchKind.Delete,
+        (projectRootPath) => [
+          {
+            // Only watch the root compiler log for each workspace folder.
+            // In monorepos, `**/lib/bs/.compiler.log` matches every package and dependency,
+            // causing a burst of events per save.
+            globPattern: {
+              baseUri: utils.pathToURI(projectRootPath),
+              pattern: c.compilerLogPartialPath,
             },
-            {
-              // Watch build artifacts
-              globPattern: {
-                baseUri: utils.pathToURI(projectRootPath),
-                pattern: path.join(c.compilerDirPartialPath, "**/*.{cmi,cmt}"),
-              },
-              kind:
-                p.WatchKind.Change | p.WatchKind.Create | p.WatchKind.Delete,
+            kind: p.WatchKind.Change | p.WatchKind.Create | p.WatchKind.Delete,
+          },
+          {
+            // Watch ninja output
+            globPattern: {
+              baseUri: utils.pathToURI(projectRootPath),
+              pattern: path.join("**", c.buildNinjaPartialPath),
             },
-            {
-              // Watch ninja output
-              globPattern: {
-                baseUri: utils.pathToURI(projectRootPath),
-                pattern: path.join("**", c.buildNinjaPartialPath),
-              },
-              kind:
-                p.WatchKind.Change | p.WatchKind.Create | p.WatchKind.Delete,
+            kind: p.WatchKind.Change | p.WatchKind.Create | p.WatchKind.Delete,
+          },
+          {
+            // Watch build artifacts
+            globPattern: {
+              baseUri: utils.pathToURI(projectRootPath),
+              pattern: path.join(c.compilerDirPartialPath, "**/*.{cmi,cmt}"),
             },
-          ];
-        },
+            kind: p.WatchKind.Change | p.WatchKind.Create | p.WatchKind.Delete,
+          },
+        ],
       );
-
       const registrationParams: p.RegistrationParams = {
         registrations: [
           {