Remove code duplication.

Author: cristianoc

client/src/commands/code_analysis.ts

@@ -144,7 +144,7 @@ let analysisProdPath = path.join(
   "rescript-editor-analysis.exe"
 );
 
-let getBinaryPath = (): string | null => {
+let getAnalysisBinaryPath = (): string | null => {
   if (fs.existsSync(analysisDevPath)) {
     return analysisDevPath;
   } else if (fs.existsSync(analysisProdPath)) {
@@ -162,7 +162,7 @@ export const runCodeAnalysisWithReanalyze = (
   let currentDocument = window.activeTextEditor.document;
   let cwd = targetDir ?? path.dirname(currentDocument.uri.fsPath);
 
-  let binaryPath = getBinaryPath();
+  let binaryPath = getAnalysisBinaryPath();
   if (binaryPath === null) {
     window.showErrorMessage("Binary executable not found.", analysisProdPath);
     return;

server/src/server.ts

@@ -65,21 +65,16 @@ let codeActionsFromDiagnostics: codeActions.filesCodeActions = {};
 // will be properly defined later depending on the mode (stdio/node-rpc)
 let send: (msg: p.Message) => void = (_) => {};
 
-let getBinaryPath = (projectRootPath: p.DocumentUri) =>
+let getBinaryDirPath = (projectRootPath: p.DocumentUri) =>
   extensionConfiguration.binaryPath === null
     ? path.join(projectRootPath, c.nodeModulesBinDir)
     : extensionConfiguration.binaryPath;
 
 let findRescriptBinary = (projectRootPath: p.DocumentUri) =>
-  extensionConfiguration.binaryPath === null
-    ? utils.findRescriptBinaryFromProjectRoot(projectRootPath)
-    : utils.findRescriptBinaryFromConfig(extensionConfiguration.binaryPath);
-
-let findBscBinary = (filePath: p.DocumentUri) =>
-  extensionConfiguration.binaryPath === null
-    ? utils.findBscBinaryFromProjectRoot(filePath)
-    : utils.findBscBinaryFromConfig(extensionConfiguration.binaryPath);
+  utils.findRescriptBinary(getBinaryDirPath(projectRootPath));
 
+let findBscBinary = (projectRootPath: p.DocumentUri) =>
+  utils.findBscBinary(getBinaryDirPath(projectRootPath));
 
 interface CreateInterfaceRequestParams {
   uri: string;
@@ -278,7 +273,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
           method: "window/showMessage",
           params: {
             type: p.MessageType.Error,
-            message: `Can't find ReScript binary in the directory ${getBinaryPath(
+            message: `Can't find ReScript binary in the directory ${getBinaryDirPath(
               projectRootPath
             )}`,
           },

server/src/utils.ts

@@ -38,51 +38,33 @@ export let findProjectRootOfFile = (
   }
 };
 
-export let findBscBinaryFromProjectRoot = (
-  source: p.DocumentUri
-): null | p.DocumentUri => {
-  let dir = path.dirname(source);
-  // The rescript package's rescript command is a JS wrapper. `rescript format`
-  // also invokes another JS wrapper. _That_ JS wrapper ultimately calls the
-  // (unexposed) bsc -format anyway.
-  let bscNativeReScriptPath = path.join(dir, c.bscNativeReScriptPartialPath);
-
-  if (fs.existsSync(bscNativeReScriptPath)) {
-    return bscNativeReScriptPath;
-  } else if (dir === source) {
-    // reached the top
+export let findBinary = (
+  binaryDirPath: p.DocumentUri | null,
+  binaryName: string
+): p.DocumentUri | null => {
+  if (binaryDirPath == null) {
     return null;
+  }
+  let binaryPath: p.DocumentUri = path.join(binaryDirPath, binaryName);
+  if (fs.existsSync(binaryPath)) {
+    return binaryPath;
   } else {
-    return findBscBinaryFromProjectRoot(dir);
+    return null;
   }
 };
 
-export let findBscBinaryFromConfig = (
-  pathToBinaryDirFromConfig: p.DocumentUri
-): null | p.DocumentUri => {
-  let bscPath = path.join(pathToBinaryDirFromConfig, c.bscBinName);
-  if (fs.existsSync(bscPath)) {
-    return bscPath;
-  }
-  return null;
+export let findRescriptBinary = (
+  binaryDirPath: p.DocumentUri | string
+): p.DocumentUri | null => {
+  return findBinary(binaryDirPath, c.rescriptBinName);
 };
 
-let findBuildBinaryBase = (rescriptPath: string): string | null => {
-  if (fs.existsSync(rescriptPath)) {
-    return rescriptPath;
-  }
-  return null;
+export let findBscBinary = (
+  binaryDirPath: p.DocumentUri | string
+): p.DocumentUri | null => {
+  return findBinary(binaryDirPath, c.bscBinName);
 };
 
-export let findRescriptBinaryFromConfig = (
-  pathToBinaryDirFromConfig: p.DocumentUri
-) =>
-  findBuildBinaryBase(path.join(pathToBinaryDirFromConfig, c.rescriptBinName));
-
-export let findRescriptBinaryFromProjectRoot = (
-  projectRootPath: p.DocumentUri
-) => findBuildBinaryBase(path.join(projectRootPath, c.rescriptNodePartialPath));
-
 type execResult =
   | {
       kind: "success";