The path option was added to the rescript.settings

Author: An-Tu

package.json

@@ -131,6 +131,11 @@
 					"type": "boolean",
 					"default": false,
 					"description": "Automatically start ReScript's code analysis."
+				},
+				"rescript.settings.path": {
+					"type": "string",
+					"default": "",
+					"description": "Path to the ReScript binary. You can use it if you haven't or don't want to use the installed ReScript binary from node_modules in your project."
 				}
 			}
 		},

server/src/constants.ts

@@ -32,13 +32,17 @@ export let analysisProdPath = path.join(
   "rescript-editor-analysis.exe"
 );
 
+export const rescriptBinName = "rescript";
+
+export const bsbBinName = "bsb";
+
 // can't use the native bsb/rescript since we might need the watcher -w flag, which is only in the JS wrapper
 export let rescriptNodePartialPath = path.join(
   "node_modules",
   ".bin",
-  "rescript"
+  rescriptBinName,
 );
-export let bsbNodePartialPath = path.join("node_modules", ".bin", "bsb");
+export let bsbNodePartialPath = path.join("node_modules", ".bin", bsbBinName);
 
 export let bsbLock = ".bsb.lock";
 export let bsconfigPartialPath = "bsconfig.json";

server/src/server.ts

@@ -4,6 +4,7 @@ import * as v from "vscode-languageserver";
 import * as rpc from "vscode-jsonrpc/node";
 import * as path from "path";
 import fs from "fs";
+import os from "os";
 // TODO: check DidChangeWatchedFilesNotification.
 import {
   DidOpenTextDocumentNotification,
@@ -23,9 +24,11 @@ import { WorkspaceEdit } from "vscode-languageserver";
 
 interface extensionConfiguration {
   askToStartBuild: boolean;
+  path: string;
 }
 let extensionConfiguration: extensionConfiguration = {
   askToStartBuild: true,
+  path: "",
 };
 let pullConfigurationPeriodically: NodeJS.Timeout | null = null;
 
@@ -209,7 +212,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
       // TODO: sometime stale .bsb.lock dangling. bsb -w knows .bsb.lock is
       // stale. Use that logic
       // TODO: close watcher when lang-server shuts down
-      if (utils.findNodeBuildOfProjectRoot(projectRootPath) != null) {
+      if (utils.findNodeBuildOfProjectRoot(projectRootPath, extensionConfiguration.path) != null) {
         let payload: clientSentBuildAction = {
           title: c.startBuildAction,
           projectRootPath: projectRootPath,
@@ -905,6 +908,32 @@ function onMessage(msg: p.Message) {
 
       if (initialConfiguration != null) {
         extensionConfiguration = initialConfiguration;
+        if (extensionConfiguration.path !== "" &&
+          !path.isAbsolute(extensionConfiguration.path)
+        ) {
+          // What should happen if the path is relative?
+          // There is an option to create an absolute path using the params from msg,
+          // but maybe it isn't the best option.
+
+          if (extensionConfiguration.path[0] === "~") {
+            extensionConfiguration.path = path.join(os.homedir(), extensionConfiguration.path.slice(1))
+          } else {
+            let rootFromMgs = null
+            // @ts-ignore
+            if (msg.params != null && msg.params.rootUri != null) {
+              // @ts-ignore
+              rootFromMgs = fileURLToPath(msg.params.rootUri);
+            }
+            // @ts-ignore
+            if (rootFromMgs == null && msg.params != null && msg.params.rootPath != null) {
+              // @ts-ignore
+              rootFromMgs = msg.params.rootPath;
+            }
+            extensionConfiguration.path = rootFromMgs == null
+              ? ""
+              : path.join(rootFromMgs, extensionConfiguration.path);
+          }
+        }
       }
 
       send(response);
@@ -1013,7 +1042,7 @@ function onMessage(msg: p.Message) {
       // TODO: close watcher when lang-server shuts down. However, by Node's
       // default, these subprocesses are automatically killed when this
       // language-server process exits
-      let found = utils.findNodeBuildOfProjectRoot(projectRootPath);
+      let found = utils.findNodeBuildOfProjectRoot(projectRootPath, extensionConfiguration.path);
       if (found != null) {
         let bsbProcess = utils.runBuildWatcherUsingValidBuildPath(
           found.buildPath,

server/src/utils.ts

@@ -72,17 +72,30 @@ export let findBscNativeOfFile = (
 
 // TODO: this doesn't handle file:/// scheme
 export let findNodeBuildOfProjectRoot = (
-  projectRootPath: p.DocumentUri
+  projectRootPath: p.DocumentUri,
+  pathToBinFromConfig: p.DocumentUri
 ): null | { buildPath: p.DocumentUri; isReScript: boolean } => {
-  let rescriptNodePath = path.join(projectRootPath, c.rescriptNodePartialPath);
-  let bsbNodePath = path.join(projectRootPath, c.bsbNodePartialPath);
+  if (pathToBinFromConfig !== "") {
+    if (fs.existsSync(pathToBinFromConfig)) {
+      if (pathToBinFromConfig.endsWith(c.rescriptBinName)) {
+        return { buildPath: pathToBinFromConfig, isReScript: true };
+      }
+      if (pathToBinFromConfig.endsWith(c.rescriptBinName)) {
+        return { buildPath: pathToBinFromConfig, isReScript: false };
+      }
+    }
+    return null;
+  } else {
+    let rescriptNodePath = path.join(projectRootPath, c.rescriptNodePartialPath);
+    let bsbNodePath = path.join(projectRootPath, c.bsbNodePartialPath);
 
-  if (fs.existsSync(rescriptNodePath)) {
-    return { buildPath: rescriptNodePath, isReScript: true };
-  } else if (fs.existsSync(bsbNodePath)) {
-    return { buildPath: bsbNodePath, isReScript: false };
+    if (fs.existsSync(rescriptNodePath)) {
+      return { buildPath: rescriptNodePath, isReScript: true };
+    } else if (fs.existsSync(bsbNodePath)) {
+      return { buildPath: bsbNodePath, isReScript: false };
+    }
+    return null;
   }
-  return null;
 };
 
 type execResult =
@@ -589,7 +602,7 @@ export let parseCompilerLogOutput = (
         code: undefined,
         severity: t.DiagnosticSeverity.Error,
         tag: undefined,
-        content: [lines[i], lines[i+1]],
+        content: [lines[i], lines[i + 1]],
       });
       i++;
     } else if (/^  +([0-9]+| +|\.) (│|┆)/.test(line)) {
@@ -603,9 +616,9 @@ export let parseCompilerLogOutput = (
       //   10 ┆
     } else if (line.startsWith("  ")) {
       // part of the actual diagnostics message
-        parsedDiagnostics[parsedDiagnostics.length - 1].content.push(
-          line.slice(2)
-        );
+      parsedDiagnostics[parsedDiagnostics.length - 1].content.push(
+        line.slice(2)
+      );
     } else if (line.trim() != "") {
       // We'll assume that everything else is also part of the diagnostics too.
       // Most of these should have been indented 2 spaces; sadly, some of them