get rid of custom paths

Author: Rusty Key

src/client/index.ts

@@ -68,28 +68,10 @@ async function isEsyProject() {
   return false;
 }
 
-async function isBSProject() {
-  // TODO: we need to use workspace.workspaceFolders here and run LSP server per
-  // root. For now we'll just run LSP per workspace.
-  const root = vscode.workspace.rootPath;
-  if (root == null) {
-    return false;
-  }
-
-  const bsconfigJson = path.join(root, "bsconfig.json");
-
-  if (await exists(bsconfigJson)) {
-    return true;
-  }
-
-  return false;
-}
-
 export async function launch(context: vscode.ExtensionContext): Promise<void> {
   const isEasyProject = await isEsyProject();
-  const isBucklescriptProject = await isBSProject();
+
   return launchMerlinLsp(context, {
-    isBucklescriptProject,
     useEsy: isEasyProject,
   });
 }
@@ -98,33 +80,19 @@ function getPrebuiltExecutablesPath() {
   return path.join(__dirname, `../../../executables/${process.platform}`);
 }
 
-function getMerlinLspPath(isBucklescriptProject: boolean) {
-  const reasonConfig = vscode.workspace.getConfiguration("reason");
-  let merlinLspPath = reasonConfig.get<string | null>("path.ocamlmerlin-lsp", null);
-
-  if (merlinLspPath == null) {
-    merlinLspPath = isWin ? "ocamlmerlin-lsp.exe" : "ocamlmerlin-lsp";
+function getMerlinLspPath(useEsy: boolean) {
+  let merlinLspPath = isWin ? "ocamlmerlin-lsp.exe" : "ocamlmerlin-lsp";
 
-    if (isBucklescriptProject) {
-      merlinLspPath = path.join(getPrebuiltExecutablesPath(), merlinLspPath);
-    }
+  if (!useEsy) {
+    merlinLspPath = path.join(getPrebuiltExecutablesPath(), merlinLspPath);
   }
 
   return merlinLspPath;
 }
 
-function getMerlinReasonDir() {
-  const reasonConfig = vscode.workspace.getConfiguration("reason");
-  const merlinReasonPath = reasonConfig.get<string | null>("path.ocamlmerlin-reason", null);
-
-  if (merlinReasonPath == null) return getPrebuiltExecutablesPath();
-
-  return path.dirname(merlinReasonPath);
-}
-
-function getMerlinLspOptions(options: { useEsy: boolean; isBucklescriptProject: boolean }) {
-  const merlinLsp = getMerlinLspPath(options.isBucklescriptProject);
-  const merlinReasonDir = getMerlinReasonDir();
+function getMerlinLspOptions(options: { useEsy: boolean }) {
+  const merlinLsp = getMerlinLspPath(options.useEsy);
+  const pth = options.useEsy ? process.env.PATH : `${getPrebuiltExecutablesPath()}:${process.env.PATH}`;
 
   let run;
   if (options.useEsy) {
@@ -148,7 +116,7 @@ function getMerlinLspOptions(options: { useEsy: boolean; isBucklescriptProject:
           MERLIN_LOG: "-",
           OCAMLFIND_CONF: "/dev/null",
           OCAMLRUNPARAM: "b",
-          PATH: merlinReasonDir,
+          PATH: pth,
         },
       },
     },
@@ -160,18 +128,15 @@ function getMerlinLspOptions(options: { useEsy: boolean; isBucklescriptProject:
           MERLIN_LOG: "-",
           OCAMLFIND_CONF: "/dev/null",
           OCAMLRUNPARAM: "b",
-          PATH: merlinReasonDir,
+          PATH: pth,
         },
       },
     },
   };
   return serverOptions;
 }
 
-export async function launchMerlinLsp(
-  context: vscode.ExtensionContext,
-  options: { useEsy: boolean; isBucklescriptProject: boolean },
-): Promise<void> {
+export async function launchMerlinLsp(context: vscode.ExtensionContext, options: { useEsy: boolean }): Promise<void> {
   const serverOptions = getMerlinLspOptions(options);
   const reasonConfig = vscode.workspace.getConfiguration("reason");