Base bsc.exe lookup on rescript binary lookup

Author: fhammerschmidt

server/src/constants.ts

@@ -6,8 +6,13 @@ let platformDir =
 // See https://microsoft.github.io/language-server-protocol/specification Abstract Message
 // version is fixed to 2.0
 export let jsonrpcVersion = "2.0";
-export let platformPath = path.join("node_modules", "rescript", platformDir);
-export let bscNativeReScriptPartialPath = path.join(platformPath, "bsc.exe");
+export let platformPath = path.join("rescript", platformDir);
+export let nodeModulesPlatformPath = path.join("node_modules", platformPath);
+export let bscExeName = "bsc.exe";
+export let bscNativeReScriptPartialPath = path.join(
+  nodeModulesPlatformPath,
+  bscExeName
+);
 
 export let analysisDevPath = path.join(
   path.dirname(__dirname),
@@ -25,7 +30,6 @@ export let analysisProdPath = path.join(
 export let rescriptBinName = "rescript";
 
 export let bscBinName = "bsc";
-export let bscExeName = "bsc.exe";
 
 export let nodeModulesBinDir = path.join("node_modules", ".bin");
 

server/src/server.ts

@@ -79,13 +79,11 @@ let codeActionsFromDiagnostics: codeActions.filesCodeActions = {};
 // will be properly defined later depending on the mode (stdio/node-rpc)
 let send: (msg: p.Message) => void = (_) => {};
 
-let findBinaryFromProjectDirRec = (
-  directory: p.DocumentUri, // This must be a directory and not a file!
-  targetDir: p.DocumentUri,
-  binaryName: p.DocumentUri
+let findBinaryPathFromProjectRoot = (
+  directory: p.DocumentUri // This must be a directory and not a file!
 ): null | p.DocumentUri => {
-  let binaryDirPath = path.join(directory, targetDir);
-  let binaryPath = path.join(binaryDirPath, binaryName);
+  let binaryDirPath = path.join(directory, c.nodeModulesBinDir);
+  let binaryPath = path.join(binaryDirPath, c.rescriptBinName);
 
   if (fs.existsSync(binaryPath)) {
     return binaryPath;
@@ -97,22 +95,26 @@ let findBinaryFromProjectDirRec = (
     return null;
   }
 
-  return findBinaryFromProjectDirRec(parentDir, targetDir, binaryName);
+  return findBinaryPathFromProjectRoot(parentDir);
 };
 
 let findRescriptBinary = (projectRootPath: p.DocumentUri) =>
   extensionConfiguration.binaryPath == null
-    ? findBinaryFromProjectDirRec(
-        projectRootPath,
-        c.nodeModulesBinDir,
-        c.rescriptBinName
-      )
+    ? findBinaryPathFromProjectRoot(projectRootPath)
     : utils.findRescriptBinary(extensionConfiguration.binaryPath);
 
-let findBscBinary = (projectRootPath: p.DocumentUri) =>
-  extensionConfiguration.binaryPath == null
-    ? findBinaryFromProjectDirRec(projectRootPath, c.platformPath, c.bscExeName)
-    : utils.findBscBinary(extensionConfiguration.binaryPath);
+let findBscBinary = (projectRootPath: p.DocumentUri) => {
+  let rescriptBinaryPath = findRescriptBinary(projectRootPath);
+  if (rescriptBinaryPath !== null) {
+    return path.join(
+      path.dirname(rescriptBinaryPath),
+      "..",
+      c.platformPath,
+      c.bscExeName
+    );
+  }
+  return null;
+};
 
 interface CreateInterfaceRequestParams {
   uri: string;