Fix notification about buildBinary absent

Author: An-Tu

server/src/constants.ts

@@ -38,13 +38,14 @@ export let bsbBinName = "bsb";
 
 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(
-  "node_modules",
-  ".bin",
-  rescriptBinName,
+  nodeModulesBinDir,
+  rescriptBinName
 );
-export let bsbNodePartialPath = path.join("node_modules", ".bin", bsbBinName);
+export let bsbNodePartialPath = path.join(nodeModulesBinDir, bsbBinName);
 
 export let bsbLock = ".bsb.lock";
 export let bsconfigPartialPath = "bsconfig.json";

server/src/server.ts

@@ -75,6 +75,11 @@ let findBscBinary = (filePath: p.DocumentUri) =>
     ? utils.findBscBinaryFromProjectRoot(filePath)
     : utils.findBscBinaryFromConfig(extensionConfiguration.binaryPath);
 
+let getConjecturalDirOfBuildBinary = (projectRootPath: p.DocumentUri) =>
+  extensionConfiguration.binaryPath === null
+    ? path.join(projectRootPath, c.nodeModulesBinDir)
+    : extensionConfiguration.binaryPath;
+
 interface CreateInterfaceRequestParams {
   uri: string;
 }
@@ -267,17 +272,14 @@ let openedFile = (fileUri: string, fileContent: string) => {
         // handle in the isResponseMessage check in the message handling way
         // below
       } else {
-        let binaryPath =
-          extensionConfiguration.binaryPath === null
-            ? path.join(projectRootPath, "node_modules", ".bin")
-            : extensionConfiguration.binaryPath;
-
         let request: p.NotificationMessage = {
           jsonrpc: c.jsonrpcVersion,
           method: "window/showMessage",
           params: {
             type: p.MessageType.Error,
-            message: `Can't find ReScript binary on path ${binaryPath}`,
+            message: `Can't find ReScript binary in the directory ${getConjecturalDirOfBuildBinary(
+              projectRootPath
+            )}`,
           },
         };
         send(request);