Fix #420 - C# LSP plugin issues in distributed builds (#421)

* Don't use hardcoded node variable * Use the exec path * Add quotes in paths
onivim · Apr 30, 2017 · c18fb1f · c18fb1f
1 parent c06101c
commit c18fb1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/browser/src/Plugins/Api/LanguageClient/LanguageClient.ts b/browser/src/Plugins/Api/LanguageClient/LanguageClient.ts
@@ -107,7 +107,7 @@ export class LanguageClient {
     public start(initializationParams: LanguageClientInitializationParams): Thenable<any> {
 
         // TODO: Pursue alternate connection mechanisms besides stdio - maybe Node IPC?
-        this._process = exec(this._startCommand, { maxBuffer: 500 * 1024 * 1024 }, (err) => {
+        this._process = exec(`"${process.execPath}" "${this._startCommand}"`, { maxBuffer: 500 * 1024 * 1024, env: { ELECTRON_RUN_AS_NODE: 1 } }, (err) => {
             if (err) {
                 console.error(err)
                 alert(err)

diff --git a/vim/core/oni-plugin-csharp/lib/index.js b/vim/core/oni-plugin-csharp/lib/index.js
@@ -9,7 +9,7 @@ const activate = (Oni) => {
 
     const omniSharpLangServerPath = path.join(__dirname, "..", "..", "..", "..", "node_modules", "omnisharp-client", "languageserver", "server.js")
 
-    const execCommand = `node "${omniSharpLangServerPath}"`
+    const execCommand = `${omniSharpLangServerPath}`
 
     const client = Oni.createLanguageClient(execCommand, (filePath) => {
         return getRootProjectFileAsync(path.dirname(filePath))