Async rewrite

.gitignore

@@ -23,3 +23,5 @@ rescript-tools.exe
 
 _opam/
 _build/
+
+*.tsbuildinfo

CHANGELOG.md

@@ -32,6 +32,10 @@
 
 - Fix: JSON from `rescript-code-editor-analysis` was not always escaped properly, which prevented code actions from being available in certain situations https://github.com/rescript-lang/rescript-vscode/pull/1089
 
+#### :house: Internal
+
+- Find binary paths asynchronously. On `>=12.0.0-alpha.13` we do this by dynamically importing the `@rescript/{target}` package in the project root. https://github.com/rescript-lang/rescript-vscode/pull/1093
+
 ## 1.62.0
 
 #### :nail_care: Polish

package.json

@@ -255,9 +255,9 @@
   },
   "devDependencies": {
     "@types/node": "^14.14.41",
+    "@types/semver": "^7.7.0",
     "@types/vscode": "1.68.0",
     "esbuild": "^0.20.1",
-    "semver": "^7.3.7",
-    "typescript": "^4.7.3"
+    "typescript": "^5.8.3"
   }
 }

server/package.json

@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "chokidar": "^3.5.1",
+    "semver": "^7.7.2",
     "vscode-jsonrpc": "^8.0.1",
     "vscode-languageserver": "^8.0.1",
     "vscode-languageserver-protocol": "^3.17.1"

server/src/codeActions.ts

@@ -141,14 +141,14 @@ let takeUntil = (array: string[], startsWith: string): string[] => {
   return res;
 };
 
-export let findCodeActionsInDiagnosticsMessage = ({
+export let findCodeActionsInDiagnosticsMessage = async ({
   diagnostic,
   diagnosticMessage,
   file,
   range,
   addFoundActionsHere: codeActions,
 }: findCodeActionsConfig) => {
-  diagnosticMessage.forEach((line, index, array) => {
+  for (const [index, line] of diagnosticMessage.entries()) {
     // Because of how actions work, there can only be one per diagnostic. So,
     // halt whenever a code action has been found.
     let codeActionExtractors = [
@@ -166,8 +166,8 @@ export let findCodeActionsInDiagnosticsMessage = ({
       let didFindAction = false;
 
       try {
-        didFindAction = extractCodeAction({
-          array,
+        didFindAction = await extractCodeAction({
+          array: diagnosticMessage,
           codeActions,
           diagnostic,
           file,
@@ -183,7 +183,7 @@ export let findCodeActionsInDiagnosticsMessage = ({
         break;
       }
     }
-  });
+  }
 };
 
 interface codeActionExtractorConfig {
@@ -196,12 +196,12 @@ interface codeActionExtractorConfig {
   codeActions: filesCodeActions;
 }
 
-type codeActionExtractor = (config: codeActionExtractorConfig) => boolean;
+type codeActionExtractor = (config: codeActionExtractorConfig) => Promise<boolean>;
 
 // This action extracts hints the compiler emits for misspelled identifiers, and
 // offers to replace the misspelled name with the correct name suggested by the
 // compiler.
-let didYouMeanAction: codeActionExtractor = ({
+let didYouMeanAction: codeActionExtractor = async ({
   codeActions,
   diagnostic,
   file,
@@ -245,7 +245,7 @@ let didYouMeanAction: codeActionExtractor = ({
 };
 
 // This action offers to wrap patterns that aren't option in Some.
-let wrapInSome: codeActionExtractor = ({
+let wrapInSome: codeActionExtractor = async ({
   codeActions,
   diagnostic,
   file,
@@ -425,7 +425,7 @@ let handleUndefinedRecordFieldsAction = ({
 // being undefined. We then offers an action that inserts all of the record
 // fields, with an `assert false` dummy value. `assert false` is so applying the
 // code action actually compiles.
-let addUndefinedRecordFieldsV10: codeActionExtractor = ({
+let addUndefinedRecordFieldsV10: codeActionExtractor = async ({
   array,
   codeActions,
   diagnostic,
@@ -459,7 +459,7 @@ let addUndefinedRecordFieldsV10: codeActionExtractor = ({
   return false;
 };
 
-let addUndefinedRecordFieldsV11: codeActionExtractor = ({
+let addUndefinedRecordFieldsV11: codeActionExtractor = async ({
   array,
   codeActions,
   diagnostic,
@@ -508,7 +508,7 @@ let addUndefinedRecordFieldsV11: codeActionExtractor = ({
 
 // This action detects suggestions of converting between mismatches in types
 // that the compiler tells us about.
-let simpleConversion: codeActionExtractor = ({
+let simpleConversion: codeActionExtractor = async ({
   line,
   codeActions,
   file,
@@ -554,7 +554,7 @@ let simpleConversion: codeActionExtractor = ({
 
 // This action will apply a curried function (essentially inserting a dot in the
 // correct place).
-let applyUncurried: codeActionExtractor = ({
+let applyUncurried: codeActionExtractor = async ({
   line,
   codeActions,
   file,
@@ -608,7 +608,7 @@ let applyUncurried: codeActionExtractor = ({
 
 // This action detects missing cases for exhaustive pattern matches, and offers
 // to insert dummy branches (using `failwith("TODO")`) for those branches.
-let simpleAddMissingCases: codeActionExtractor = ({
+let simpleAddMissingCases: codeActionExtractor = async ({
   line,
   codeActions,
   file,
@@ -629,7 +629,7 @@ let simpleAddMissingCases: codeActionExtractor = ({
 
     let filePath = fileURLToPath(file);
 
-    let newSwitchCode = utils.runAnalysisAfterSanityCheck(filePath, [
+    let newSwitchCode = await utils.runAnalysisAfterSanityCheck(filePath, [
       "codemod",
       filePath,
       range.start.line,
@@ -665,7 +665,7 @@ let simpleAddMissingCases: codeActionExtractor = ({
 // This detects concrete variables or values put in a position which expects an
 // optional of that same type, and offers to wrap the value/variable in
 // `Some()`.
-let simpleTypeMismatches: codeActionExtractor = ({
+let simpleTypeMismatches: codeActionExtractor = async ({
   line,
   codeActions,
   file,

server/src/constants.ts

@@ -7,15 +7,8 @@ export let platformDir =
 // See https://microsoft.github.io/language-server-protocol/specification Abstract Message
 // version is fixed to 2.0
 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 editorAnalysisName = "rescript-editor-analysis.exe";
 export let builtinAnalysisDevPath = path.join(
   path.dirname(__dirname),
   "..",
@@ -34,12 +27,6 @@ export let bscBinName = "bsc";
 
 export let nodeModulesBinDir = path.join("node_modules", ".bin");
 
-// can't use the native bsb/rescript since we might need the watcher -w flag, which is only in the JS wrapper
-export let rescriptNodePartialPath = path.join(
-  nodeModulesBinDir,
-  rescriptBinName
-);
-
 export let bsbLock = ".bsb.lock";
 export let bsconfigPartialPath = "bsconfig.json";
 export let rescriptJsonPartialPath = "rescript.json";