Fix request failed when there's a white space in the project path.

Fixes #78

Author: cristianoc

CHANGELOG.md

@@ -1,3 +1,7 @@
+## master
+
+- Fix request failed when there's a white space in the project path.
+
 ## 1.0.5
 
 Features:

RescriptEditorSupport.ts

@@ -0,0 +1,93 @@
+import { fileURLToPath } from "url";
+import { RequestMessage } from "vscode-languageserver";
+import * as utils from "./utils";
+import * as path from "path";
+import { exec } from "child_process";
+import fs from "fs";
+
+let binaryPath = path.join(
+  path.dirname(__dirname),
+  process.platform,
+  "rescript-editor-support.exe"
+);
+
+export let binaryExists = fs.existsSync(binaryPath);
+
+let findExecutable = (uri: string) => {
+  let filePath = fileURLToPath(uri);
+  let projectRootPath = utils.findProjectRootOfFile(filePath);
+  if (projectRootPath == null || !binaryExists) {
+    return null;
+  } else {
+    return {
+      binaryPathQuoted: '"' + binaryPath + '"', // path could have white space
+      filePathQuoted: '"' + filePath + '"',
+      cwd: projectRootPath,
+    };
+  }
+};
+
+export function runDumpCommand(
+  msg: RequestMessage,
+  onResult: (
+    result: { hover?: string; definition?: { uri?: string; range: any } } | null
+  ) => void
+) {
+  let executable = findExecutable(msg.params.textDocument.uri);
+  if (executable == null) {
+    onResult(null);
+  } else {
+    let command =
+      executable.binaryPathQuoted +
+      " dump " +
+      executable.filePathQuoted +
+      ":" +
+      msg.params.position.line +
+      ":" +
+      msg.params.position.character;
+    exec(command, { cwd: executable.cwd }, function (_error, stdout, _stderr) {
+      let result = JSON.parse(stdout);
+      if (result && result[0]) {
+        onResult(result[0]);
+      } else {
+        onResult(null);
+      }
+    });
+  }
+}
+
+export function runCompletionCommand(
+  msg: RequestMessage,
+  code: string,
+  onResult: (result: [{ label: string }] | null) => void
+) {
+  let executable = findExecutable(msg.params.textDocument.uri);
+  if (executable == null) {
+    onResult(null);
+  } else {
+    let tmpname = utils.createFileInTempDir();
+    fs.writeFileSync(tmpname, code, { encoding: "utf-8" });
+
+    let command =
+      executable.binaryPathQuoted +
+      " complete " +
+      executable.filePathQuoted +
+      ":" +
+      msg.params.position.line +
+      ":" +
+      msg.params.position.character +
+      " " +
+      tmpname;
+
+    exec(command, { cwd: executable.cwd }, function (_error, stdout, _stderr) {
+      // async close is fine. We don't use this file name again
+      fs.unlink(tmpname, () => null);
+      let result = JSON.parse(stdout);
+      if (result && result[0]) {
+        onResult(result);
+      } else {
+        onResult(null);
+      }
+    });
+  }
+}

server/src/RescriptEditorSupport.ts

@@ -19,7 +19,11 @@ let findExecutable = (uri: string) => {
   if (projectRootPath == null || !binaryExists) {
     return null;
   } else {
-    return { binaryPath, filePath, cwd: projectRootPath };
+    return {
+      binaryPathQuoted: '"' + binaryPath + '"', // path could have white space
+      filePathQuoted: '"' + filePath + '"',
+      cwd: projectRootPath,
+    };
   }
 };
 
@@ -34,9 +38,9 @@ export function runDumpCommand(
     onResult(null);
   } else {
     let command =
-      executable.binaryPath +
+      executable.binaryPathQuoted +
       " dump " +
-      executable.filePath +
+      executable.filePathQuoted +
       ":" +
       msg.params.position.line +
       ":" +
@@ -65,9 +69,9 @@ export function runCompletionCommand(
     fs.writeFileSync(tmpname, code, { encoding: "utf-8" });
 
     let command =
-      executable.binaryPath +
+      executable.binaryPathQuoted +
       " complete " +
-      executable.filePath +
+      executable.filePathQuoted +
       ":" +
       msg.params.position.line +
       ":" +