Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 13e711c

Browse files
authored
Merge pull request #25 from arduino/language-server-cli-config
Pass cliConfigPath to Language Server
2 parents 6d43f83 + 0ecf34a commit 13e711c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

‎src/extension.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { LanguageClient, CloseAction, ErrorAction, InitializeError, Message, Rev
1111
interface LanguageServerConfig {
1212
readonly lsPath: string;
1313
readonly cliPath: string;
14+
readonly cliConfigPath: string;
1415
readonly clangdPath: string;
1516
readonly board: {
1617
readonly fqbn: string;
@@ -187,8 +188,8 @@ async function startLanguageServer(context: ExtensionContext, config: LanguageSe
187188
}
188189

189190
async function buildLanguageClient(config: LanguageServerConfig): Promise<LanguageClient> {
190-
const { lsPath: command, clangdPath, cliPath, board, flags, env, log } = config;
191-
const args = ['-clangd', clangdPath, '-cli', cliPath, '-fqbn', board.fqbn];
191+
const { lsPath: command, clangdPath, cliPath, cliConfigPath,board, flags, env, log } = config;
192+
const args = ['-clangd', clangdPath, '-cli', cliPath, '-cli-config',cliConfigPath,'-fqbn', board.fqbn];
192193
if (board.name) {
193194
args.push('-board-name', board.name);
194195
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /