ensure existing config is synced up on init

Author: zth

client/src/extension.ts

@@ -130,6 +130,12 @@ export function activate(context: ExtensionContext) {
       // Notify the server about file changes to '.clientrc files contained in the workspace
       fileEvents: workspace.createFileSystemWatcher("**/.clientrc"),
     },
+    // We'll send the initial configuration in here, but this might be
+    // problematic because every consumer of the LS will need to mimic this.
+    // We'll leave it like this for now, but might be worth revisiting later on.
+    initializationOptions: {
+      extensionConfiguration: workspace.getConfiguration("rescript.settings"),
+    },
   };
 
   // Create the language client and start the client.
@@ -199,8 +205,7 @@ export function activate(context: ExtensionContext) {
     codeAnalysisRunningStatusBarItem.command =
       "rescript-vscode.stop_code_analysis";
     codeAnalysisRunningStatusBarItem.show();
-    codeAnalysisRunningStatusBarItem.text =
-      "$(debug-stop) Stop Code Analyzer";
+    codeAnalysisRunningStatusBarItem.text = "$(debug-stop) Stop Code Analyzer";
 
     customCommands.codeAnalysisWithReanalyze(
       inCodeAnalysisState.activatedFromDirectory,

server/src/server.ts

@@ -11,6 +11,7 @@ import {
   DidChangeTextDocumentNotification,
   DidCloseTextDocumentNotification,
   DidChangeConfigurationNotification,
+  InitializeParams,
 } from "vscode-languageserver-protocol";
 import * as utils from "./utils";
 import * as codeActions from "./codeActions";
@@ -281,8 +282,6 @@ if (process.argv.includes("--stdio")) {
   process.on("message", onMessage);
 }
 
-askForAllCurrentConfiguration();
-
 function hover(msg: p.RequestMessage) {
   let params = msg.params as p.HoverParams;
   let filePath = fileURLToPath(params.textDocument.uri);
@@ -860,8 +859,14 @@ function onMessage(msg: m.Message) {
         askForAllCurrentConfiguration();
       }, 10_000);
 
-      // Pull config right away as we've initied.
-      askForAllCurrentConfiguration();
+      // Save initial configuration, if present
+      let initParams = msg.params as InitializeParams;
+      let initialConfiguration = initParams.initializationOptions
+        ?.extensionConfiguration as extensionConfiguration | undefined;
+
+      if (initialConfiguration != null) {
+        extensionConfiguration = initialConfiguration;
+      }
 
       send(response);
     } else if (msg.method === "initialized") {