Skip to content

Commit 852bf9b

Browse files
committed
https://arduino.atlassian.net/browse/ATL-1247
1 parent db48ed6 commit 852bf9b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,11 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
288288
}
289289
}
290290
const { clangdUri, cliUri, lsUri } = await this.executableService.list();
291-
const [clangdPath, cliPath, lsPath] = await Promise.all([
291+
const [clangdPath, cliPath, lsPath, cliConfigPath] = await Promise.all([
292292
this.fileService.fsPath(new URI(clangdUri)),
293293
this.fileService.fsPath(new URI(cliUri)),
294294
this.fileService.fsPath(new URI(lsUri)),
295+
this.fileService.fsPath(new URI(await this.configService.getCliConfigFileUri()))
295296
]);
296297
this.languageServerFqbn = await Promise.race([
297298
new Promise<undefined>((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${20_000} ms.`)), 20_000)),
@@ -300,6 +301,7 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
300301
cliPath,
301302
clangdPath,
302303
log: currentSketchPath ? currentSketchPath : log,
304+
cliConfigPath,
303305
board: {
304306
fqbn,
305307
name: name ? `"${name}"` : undefined

Diff for: arduino-ide-extension/src/common/protocol/config-service.ts

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export const ConfigServicePath = '/services/config-service';
22
export const ConfigService = Symbol('ConfigService');
33
export interface ConfigService {
44
getVersion(): Promise<Readonly<{ version: string, commit: string, status?: string }>>;
5+
getCliConfigFileUri(): Promise<string>;
56
getConfiguration(): Promise<Config>;
67
setConfiguration(config: Config): Promise<void>;
78
isInDataDir(uri: string): Promise<boolean>;

0 commit comments

Comments
 (0)