Use findReScriptVersionForProjectRoot

Author: nojaf

Diff for: server/src/server.ts

@@ -268,7 +268,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
         filesDiagnostics: {},
         namespaceName:
           namespaceName.kind === "success" ? namespaceName.result : null,
-        rescriptVersion: utils.findReScriptVersion(projectRootPath),
+        rescriptVersion: utils.findReScriptVersionForProjectRoot(projectRootPath),
         bsbWatcherByEditor: null,
         bscBinaryLocation: utils.findBscExeBinary(projectRootPath),
         editorAnalysisLocation: utils.findEditorAnalysisBinary(projectRootPath),

Diff for: server/src/utils.ts

@@ -67,8 +67,7 @@ export let findProjectRootOfFile = (
   if (foundRootFromProjectFiles != null) {
     return foundRootFromProjectFiles;
   } else {
-    const dirStat = fs.statSync(source);
-    const isDir = dirStat.isDirectory();
+    const isDir = path.extname(source) === "";
     return findProjectRootOfFileInDir(
       isDir && !allowDir ? path.join(source, "dummy.res") : source
     );
@@ -166,6 +165,24 @@ export let findReScriptVersion = (
   }
 };
 
+export function findReScriptVersionForProjectRoot(projectRootPath:string) : string | undefined {
+  let rescriptBinary = lookup.findFilePathFromProjectRoot(
+    projectRootPath,
+    path.join(c.nodeModulesBinDir, c.rescriptBinName)
+  );
+
+  if (rescriptBinary == null) {
+    return undefined;
+  }
+
+  try {
+    let version = childProcess.execSync(`${rescriptBinary} -v`);
+    return version.toString().trim();
+  } catch (e) {
+    return undefined;
+  }
+}
+
 // This is the path for the _builtin_ legacy analysis, that works for versions 11 and below.
 let builtinBinaryPath: string | null = null;
 if (fs.existsSync(c.builtinAnalysisDevPath)) {