From ec6b5ed3f37e7d68dd62865a62650fcf3ff5e19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Sp=C3=B6nemann?= Date: Tue, 27 Aug 2019 16:25:31 +0200 Subject: [PATCH] Added command line argument for specifying cli path --- .../arduino-language-server-contribution.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts b/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts index 802fe8d3..1e6d44e9 100644 --- a/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts +++ b/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts @@ -23,13 +23,14 @@ export class ArduinoLanguageServerContribution extends BaseLanguageServerContrib } async start(clientConnection: IConnection): Promise { - const clangd = await this.resolveExecutable('clangd') - const languageServer = await this.resolveExecutable('arduino-language-server') + const clangd = await this.resolveExecutable('clangd'); + const languageServer = await this.resolveExecutable('arduino-language-server'); + const cli = await this.resolveExecutable('arduino-cli'); // Add '-log' argument to enable logging to files - const args: string[] = ['-clangd', clangd] - console.log(`Starting language server ${languageServer} ${args.join(' ')}`) - const serverConnection = await this.createProcessStreamConnectionAsync(languageServer, args) - this.forward(clientConnection, serverConnection) + const args: string[] = ['-clangd', clangd, '-cli', cli]; + console.log(`Starting language server ${languageServer} ${args.join(' ')}`); + const serverConnection = await this.createProcessStreamConnectionAsync(languageServer, args); + this.forward(clientConnection, serverConnection); } protected resolveExecutable(name: string): Promise {