Tweak some names

Author: chenglou

server/src/constants.ts

@@ -3,18 +3,17 @@ import * as path from "path";
 // See https://microsoft.github.io/language-server-protocol/specification Abstract Message
 // version is fixed to 2.0
 export let jsonrpcVersion = "2.0";
-export let bscPartialPath = path.join(
+export let bscExePartialPath = path.join(
   "node_modules",
   "bs-platform",
   process.platform,
   "bsc.exe"
 );
-
 export let bscNodePartialPath = path.join("node_modules", ".bin", "bsc");
 
 // can't use the native bsb since we might need the watcher -w flag, which is only in the js wrapper
 // export let bsbPartialPath = path.join('node_modules', 'bs-platform', process.platform, 'bsb.exe');
-export let bsbPartialPath = path.join("node_modules", ".bin", "bsb");
+export let bsbNodePartialPath = path.join("node_modules", ".bin", "bsb");
 export let bsbLock = ".bsb.lock";
 export let bsconfigPartialPath = "bsconfig.json";
 export let compilerLogPartialPath = path.join("lib", "bs", ".compiler.log");

server/src/server.ts

@@ -141,7 +141,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
     // because otherwise the diagnostics info we'll display might be stale
     let bsbLockPath = path.join(projectRootPath, c.bsbLock);
     if (firstOpenFileOfProject && !fs.existsSync(bsbLockPath)) {
-      let bsbPath = path.join(projectRootPath, c.bsbPartialPath);
+      let bsbPath = path.join(projectRootPath, c.bsbNodePartialPath);
       // TODO: sometime stale .bsb.lock dangling. bsb -w knows .bsb.lock is
       // stale. Use that logic
       // TODO: close watcher when lang-server shuts down
@@ -426,7 +426,7 @@ process.on("message", (msg: m.Message) => {
           process.send!(response);
         } else {
           let bscExists = false;
-          let bscPath = path.join(projectRootPath, c.bscPartialPath);
+          let bscPath = path.join(projectRootPath, c.bscExePartialPath);
           bscExists = fs.existsSync(bscPath);
           if (!bscExists) {
             // In certain cases the native bsc binaries might be put in an unknown location
@@ -510,7 +510,7 @@ process.on("message", (msg: m.Message) => {
     ) {
       let msg_ = msg.result as clientSentBuildAction;
       let projectRootPath = msg_.projectRootPath;
-      let bsbPath = path.join(projectRootPath, c.bsbPartialPath);
+      let bsbPath = path.join(projectRootPath, c.bsbNodePartialPath);
       // TODO: sometime stale .bsb.lock dangling
       // TODO: close watcher when lang-server shuts down
       if (fs.existsSync(bsbPath)) {