Add utils.findFilePathFromProjectRoot()

Author: Bart Schuurmans

server/src/server.ts

@@ -85,31 +85,10 @@ let codeActionsFromDiagnostics: codeActions.filesCodeActions = {};
 // will be properly defined later depending on the mode (stdio/node-rpc)
 let send: (msg: p.Message) => void = (_) => {};
 
-// Check if the rescript binary is available at node_modules/.bin/rescript,
-// otherwise recursively check parent directories for it.
-let findBinaryPathFromProjectRoot = (
-  directory: p.DocumentUri // This must be a directory and not a file!
-): null | p.DocumentUri => {
-  let binaryDirPath = path.join(directory, c.nodeModulesBinDir);
-  let binaryPath = path.join(binaryDirPath, c.rescriptBinName);
-
-  if (fs.existsSync(binaryPath)) {
-    return binaryPath;
-  }
-
-  let parentDir = path.dirname(directory);
-  if (parentDir === directory) {
-    // reached the top
-    return null;
-  }
-
-  return findBinaryPathFromProjectRoot(parentDir);
-};
-
-let findRescriptBinary = (projectRootPath: p.DocumentUri) =>
+let findRescriptBinary = (projectRootPath: p.DocumentUri | null) =>
   extensionConfiguration.binaryPath == null
-    ? findBinaryPathFromProjectRoot(projectRootPath)
-    : utils.findRescriptBinary(extensionConfiguration.binaryPath);
+    ? utils.findFileFromProjectRoot(projectRootPath, path.join(c.nodeModulesBinDir, c.rescriptBinName))
+    : utils.findBinary(extensionConfiguration.binaryPath, c.rescriptBinName);
 
 let findBscBinary = (projectRootPath: p.DocumentUri) => {
   let rescriptBinaryPath = findRescriptBinary(projectRootPath);

server/src/utils.ts

@@ -38,6 +38,31 @@ export let findProjectRootOfFile = (
   }
 };
 
+// Check if filePartialPath exists at directory and return the joined path,
+// otherwise recursively check parent directories for it.
+export let findFilePathFromProjectRoot = (
+  directory: p.DocumentUri | null, // This must be a directory and not a file!
+  filePartialPath: string
+): null | p.DocumentUri => {
+  if (directory == null) {
+    return null;
+  }
+
+  let filePath: p.documentUri = path.join(directory, filePartialPath);
+  if (fs.existsSync(filePath)) {
+    return filePath;
+  }
+
+  let parentDir: p.documentUri = path.dirname(directory);
+  if (parentDir === directory) {
+    // reached the top
+    return null;
+  }
+
+  return findFilePathFromProjectRoot(parentDir, filePartialPath);
+};
+
+// Check if binaryName exists inside binaryDirPath and return the joined path.
 export let findBinary = (
   binaryDirPath: p.DocumentUri | null,
   binaryName: string
@@ -53,12 +78,6 @@ export let findBinary = (
   }
 };
 
-export let findRescriptBinary = (
-  binaryDirPath: p.DocumentUri | null
-): p.DocumentUri | null => {
-  return findBinary(binaryDirPath, c.rescriptBinName);
-};
-
 export let findBscBinary = (
   binaryDirPath: p.DocumentUri | null
 ): p.DocumentUri | null => {