Updated to 0.15.0-rc1 CLI and 12.x snapshot clangd.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta
2021-01-26 16:28:12 +01:00
committed by Akos Kitta
parent 1f544b2656
commit a99093624f
6 changed files with 61 additions and 37 deletions

View File

@@ -1,4 +1,3 @@
import * as os from 'os';
import { injectable, inject } from 'inversify';
import { ILogger } from '@theia/core/lib/common/logger';
import { FileUri } from '@theia/core/lib/node/file-uri';
@@ -14,7 +13,7 @@ export class ExecutableServiceImpl implements ExecutableService {
async list(): Promise<{ clangdUri: string, cliUri: string, lsUri: string }> {
const [ls, clangd, cli] = await Promise.all([
getExecPath('arduino-language-server', this.onError.bind(this)),
getExecPath('clangd', this.onError.bind(this), undefined, os.platform() !== 'win32'),
getExecPath('clangd', this.onError.bind(this), undefined, true),
getExecPath('arduino-cli', this.onError.bind(this))
]);
return {

View File

@@ -19,7 +19,7 @@ describe('getExecPath', () => {
});
it('should resolve clangd', async () => {
const actual = await getExecPath('clangd', onError, '--version', os.platform() !== 'win32');
const actual = await getExecPath('clangd', onError, '--version', true);
const expected = os.platform() === 'win32' ? '\\clangd.exe' : '/clangd';
expect(actual).to.endsWith(expected);
});