run analysis from compiler package if high enough version

server/src/constants.ts

@@ -10,21 +10,22 @@ export let jsonrpcVersion = "2.0";
 export let platformPath = path.join("rescript", platformDir);
 export let nodeModulesPlatformPath = path.join("node_modules", platformPath);
 export let bscExeName = "bsc.exe";
+export let editorAnalysisName = "rescript-editor-analysis.exe";
 export let bscNativeReScriptPartialPath = path.join(
   nodeModulesPlatformPath,
   bscExeName
 );
 
-export let analysisDevPath = path.join(
+export let builtinAnalysisDevPath = path.join(
   path.dirname(__dirname),
   "..",
-  "rescript-editor-analysis.exe"
+  editorAnalysisName
 );
-export let analysisProdPath = path.join(
+export let builtinAnalysisProdPath = path.join(
   path.dirname(__dirname),
   "analysis_binaries",
   platformDir,
-  "rescript-editor-analysis.exe"
+  editorAnalysisName
 );
 
 export let rescriptBinName = "rescript";

server/src/projectFiles.ts

@@ -11,6 +11,7 @@ interface projectFiles {
   filesDiagnostics: filesDiagnostics;
   rescriptVersion: string | undefined;
   bscBinaryLocation: string | null;
+  editorAnalysisLocation: string | null;
   namespaceName: string | null;
 
   bsbWatcherByEditor: null | cp.ChildProcess;

server/src/server.ts

@@ -272,6 +272,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
         rescriptVersion: utils.findReScriptVersion(projectRootPath),
         bsbWatcherByEditor: null,
         bscBinaryLocation: utils.findBscExeBinary(projectRootPath),
+        editorAnalysisLocation: utils.findEditorAnalysisBinary(projectRootPath),
         hasPromptedToStartBuild: /(\/|\\)node_modules(\/|\\)/.test(
           projectRootPath
         )

server/src/utils.ts

@@ -192,23 +192,19 @@ export let findReScriptVersion = (
   }
 };
 
-let binaryPath: string | null = null;
-if (fs.existsSync(c.analysisDevPath)) {
-  binaryPath = c.analysisDevPath;
-} else if (fs.existsSync(c.analysisProdPath)) {
-  binaryPath = c.analysisProdPath;
-} else {
+// 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)) {
+  builtinBinaryPath = c.builtinAnalysisDevPath;
+} else if (fs.existsSync(c.builtinAnalysisProdPath)) {
+  builtinBinaryPath = c.builtinAnalysisProdPath;
 }
 
 export let runAnalysisAfterSanityCheck = (
   filePath: p.DocumentUri,
   args: Array<any>,
   projectRequired = false
 ) => {
-  if (binaryPath == null) {
-    return null;
-  }
-
   let projectRootPath = findProjectRootOfFile(filePath);
   if (projectRootPath == null && projectRequired) {
     return null;
@@ -217,6 +213,35 @@ export let runAnalysisAfterSanityCheck = (
     projectsFiles.get(projectRootPath ?? "")?.rescriptVersion ??
     findReScriptVersion(filePath);
 
+  let binaryPath = builtinBinaryPath;
+
+  let project = projectRootPath ? projectsFiles.get(projectRootPath) : null;
+
+  /**
+   * All versions including 12.0.0-alpha.5 and above should use the analysis binary
+   * that now ships with the compiler. Previous versions use the legacy one we ship
+   * with the extension itself.
+   */
+  let shouldUseBuiltinAnalysis =
+    rescriptVersion?.startsWith("9.") ||
+    rescriptVersion?.startsWith("10.") ||
+    rescriptVersion?.startsWith("11.") ||
+    [
+      "12.0.0-alpha.1",
+      "12.0.0-alpha.2",
+      "12.0.0-alpha.3",
+      "12.0.0-alpha.4",
+    ].includes(rescriptVersion ?? "");
+
+  if (!shouldUseBuiltinAnalysis && project != null) {
+    binaryPath = project.editorAnalysisLocation;
+  } else if (!shouldUseBuiltinAnalysis && project == null) {
+    // TODO: Warn user about broken state?
+    return null;
+  } else {
+    binaryPath = builtinBinaryPath;
+  }
+
   let options: childProcess.ExecFileSyncOptions = {
     cwd: projectRootPath || undefined,
     maxBuffer: Infinity,
@@ -233,6 +258,11 @@ export let runAnalysisAfterSanityCheck = (
           : undefined,
     },
   };
+
+  if (binaryPath == null) {
+    return null;
+  }
+
   let stdout = "";
   try {
     stdout = childProcess.execFileSync(binaryPath, args, options).toString();
@@ -737,3 +767,6 @@ let findPlatformPath = (projectRootPath: p.DocumentUri | null) => {
 
 export let findBscExeBinary = (projectRootPath: p.DocumentUri | null) =>
   findBinary(findPlatformPath(projectRootPath), c.bscExeName);
+
+export let findEditorAnalysisBinary = (projectRootPath: p.DocumentUri | null) =>
+  findBinary(findPlatformPath(projectRootPath), c.editorAnalysisName);