rename and cleanup

Author: cristianoc

server/src/constants.ts

@@ -28,8 +28,6 @@ export let analysisProdPath = path.join(
 
 export let rescriptBinName = "rescript";
 
-export let bsbBinName = "bsb";
-
 export let bscBinName = "bsc";
 
 export let nodeModulesBinDir = path.join("node_modules", ".bin");
@@ -39,7 +37,6 @@ export let rescriptNodePartialPath = path.join(
   nodeModulesBinDir,
   rescriptBinName
 );
-export let bsbNodePartialPath = path.join(nodeModulesBinDir, bsbBinName);
 
 export let bsbLock = ".bsb.lock";
 export let bsconfigPartialPath = "bsconfig.json";

server/src/server.ts

@@ -65,7 +65,7 @@ let codeActionsFromDiagnostics: codeActions.filesCodeActions = {};
 // will be properly defined later depending on the mode (stdio/node-rpc)
 let send: (msg: p.Message) => void = (_) => {};
 
-let findBuildBinary = (projectRootPath: p.DocumentUri) =>
+let findRescriptBinary = (projectRootPath: p.DocumentUri) =>
   extensionConfiguration.binaryPath === null
     ? utils.findBuildBinaryFromProjectRoot(projectRootPath)
     : utils.findBuildBinaryFromConfig(extensionConfiguration.binaryPath);
@@ -250,7 +250,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 (findBuildBinary(projectRootPath) != null) {
+      if (findRescriptBinary(projectRootPath) != null) {
         let payload: clientSentBuildAction = {
           title: c.startBuildAction,
           projectRootPath: projectRootPath,
@@ -1081,11 +1081,10 @@ 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 = findBuildBinary(projectRootPath);
-      if (found != null) {
+      let rescriptBinaryPath = findRescriptBinary(projectRootPath);
+      if (rescriptBinaryPath != null) {
         let bsbProcess = utils.runBuildWatcherUsingValidBuildPath(
-          found.buildPath,
-          found.isReScript,
+          rescriptBinaryPath,
           projectRootPath
         );
         let root = projectsFiles.get(projectRootPath)!;

server/src/utils.ts

@@ -67,37 +67,20 @@ export let findBscBinaryFromConfig = (
   return null;
 };
 
-// The function is to check that the build binary file exists
-// and also determine what exactly the user is using ReScript or BuckleScript.
-// TODO: this doesn't handle file:/// scheme
-let findBuildBinaryBase = ({
-  rescriptPath,
-  bsbPath,
-}: {
-  rescriptPath: p.DocumentUri;
-  bsbPath: p.DocumentUri;
-}): null | { buildPath: p.DocumentUri; isReScript: boolean } => {
+let findBuildBinaryBase = (rescriptPath: string): string | null => {
   if (fs.existsSync(rescriptPath)) {
-    return { buildPath: rescriptPath, isReScript: true };
-  } else if (fs.existsSync(bsbPath)) {
-    return { buildPath: bsbPath, isReScript: false };
+    return rescriptPath;
   }
   return null;
 };
 
 export let findBuildBinaryFromConfig = (
   pathToBinaryDirFromConfig: p.DocumentUri
 ) =>
-  findBuildBinaryBase({
-    rescriptPath: path.join(pathToBinaryDirFromConfig, c.rescriptBinName),
-    bsbPath: path.join(pathToBinaryDirFromConfig, c.bsbBinName),
-  });
+  findBuildBinaryBase(path.join(pathToBinaryDirFromConfig, c.rescriptBinName));
 
 export let findBuildBinaryFromProjectRoot = (projectRootPath: p.DocumentUri) =>
-  findBuildBinaryBase({
-    rescriptPath: path.join(projectRootPath, c.rescriptNodePartialPath),
-    bsbPath: path.join(projectRootPath, c.bsbNodePartialPath),
-  });
+  findBuildBinaryBase(path.join(projectRootPath, c.rescriptNodePartialPath));
 
 type execResult =
   | {
@@ -338,7 +321,6 @@ export let getCompiledFilePath = (
 
 export let runBuildWatcherUsingValidBuildPath = (
   buildPath: p.DocumentUri,
-  isRescript: boolean,
   projectRootPath: p.DocumentUri
 ) => {
   let cwdEnv = {
@@ -357,17 +339,9 @@ export let runBuildWatcherUsingValidBuildPath = (
         (since the path might have spaces), which `execFile` would have done
         for you under the hood
     */
-    if (isRescript) {
-      return childProcess.exec(`"${buildPath}".cmd build -w`, cwdEnv);
-    } else {
-      return childProcess.exec(`"${buildPath}".cmd -w`, cwdEnv);
-    }
+    return childProcess.exec(`"${buildPath}".cmd build -w`, cwdEnv);
   } else {
-    if (isRescript) {
-      return childProcess.execFile(buildPath, ["build", "-w"], cwdEnv);
-    } else {
-      return childProcess.execFile(buildPath, ["-w"], cwdEnv);
-    }
+    return childProcess.execFile(buildPath, ["build", "-w"], cwdEnv);
   }
 };