try to not break encapsulation

Author: zth

client/src/extension.ts

@@ -248,6 +248,14 @@ export function activate(context: ExtensionContext) {
   // language client, and because of that requires a full restart.
   context.subscriptions.push(
     workspace.onDidChangeConfiguration(({ affectsConfiguration }) => {
+      // Send a general message that configuration has updated. Clients
+      // interested can then pull the new configuration as they see fit.
+      client
+        .sendNotification("workspace/didChangeConfiguration")
+        .catch((err) => {
+          window.showErrorMessage(String(err));
+        });
+
       // Put any configuration that, when changed, requires a full restart of
       // the server here. That will typically be any configuration that affects
       // the capabilities declared by the server, since those cannot be updated

server/src/server.ts

@@ -741,10 +741,30 @@ function format(msg: p.RequestMessage): Array<p.Message> {
     let bscBinaryPath =
       projectRootPath === null ? null : findBscBinary(projectRootPath);
 
-    if (
-      bscBinaryPath == null &&
-      !extensionConfiguration.allowBuiltInFormatter
-    ) {
+    let formattedResult = utils.formatCode(
+      bscBinaryPath,
+      filePath,
+      code,
+      extensionConfiguration.allowBuiltInFormatter
+    );
+    if (formattedResult.kind === "success") {
+      let max = code.length;
+      let result: p.TextEdit[] = [
+        {
+          range: {
+            start: { line: 0, character: 0 },
+            end: { line: max, character: max },
+          },
+          newText: formattedResult.result,
+        },
+      ];
+      let response: p.ResponseMessage = {
+        jsonrpc: c.jsonrpcVersion,
+        id: msg.id,
+        result: result,
+      };
+      return [response];
+    } else if (formattedResult.kind === "blocked-using-built-in-formatter") {
       // Let's only prompt the user once about this, or things might become annoying.
       if (hasPromptedAboutBuiltInFormatter) {
         return [fakeSuccessResponse];
@@ -763,26 +783,6 @@ function format(msg: p.RequestMessage): Array<p.Message> {
         params: params,
       };
       return [fakeSuccessResponse, response];
-    }
-
-    let formattedResult = utils.formatCode(bscBinaryPath, filePath, code);
-    if (formattedResult.kind === "success") {
-      let max = code.length;
-      let result: p.TextEdit[] = [
-        {
-          range: {
-            start: { line: 0, character: 0 },
-            end: { line: max, character: max },
-          },
-          newText: formattedResult.result,
-        },
-      ];
-      let response: p.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        result: result,
-      };
-      return [response];
     } else {
       // let the diagnostics logic display the updated syntax errors,
       // from the build.

server/src/utils.ts

@@ -75,11 +75,18 @@ type execResult =
       error: string;
     };
 
+type formatCodeResult =
+  | execResult
+  | {
+      kind: "blocked-using-built-in-formatter";
+    };
+
 export let formatCode = (
   bscPath: p.DocumentUri | null,
   filePath: string,
-  code: string
-): execResult => {
+  code: string,
+  allowBuiltInFormatter: boolean
+): formatCodeResult => {
   let extension = path.extname(filePath);
   let formatTempFileFullPath = createFileInTempDir(extension);
   fs.writeFileSync(formatTempFileFullPath, code, {
@@ -100,6 +107,12 @@ export let formatCode = (
         result: result.toString(),
       };
     } else {
+      if (!allowBuiltInFormatter) {
+        return {
+          kind: "blocked-using-built-in-formatter",
+        };
+      }
+
       let result = runAnalysisAfterSanityCheck(
         formatTempFileFullPath,
         ["format", formatTempFileFullPath],