File tree Expand file tree Collapse file tree
Extension/src/LanguageServer Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1535,16 +1535,20 @@ export class DefaultClient implements Client {
15351535
15361536 const otherSettingsFolder : OtherSettings = new OtherSettings ( this . RootUri ) ;
15371537 const otherSettingsWorkspace : OtherSettings = new OtherSettings ( ) ;
1538+ const clangTidyConfig : vscode . WorkspaceConfiguration = vscode . workspace . getConfiguration ( "C_Cpp.codeAnalysis.clangTidy" , this . RootUri ) ;
15381539
15391540 // Unlike the LSP message, the event does not contain all settings as a payload, so we need to
15401541 // build a new JSON object with everything we need on the native side.
15411542 const settings : any = {
15421543 C_Cpp : {
15431544 ...cppSettingsScoped ,
1545+ clang_format_path : util . resolveVariables ( cppSettingsScoped . clang_format_path , this . AdditionalEnvironment ) ,
1546+ intelliSenseCachePath : util . resolveCachePath ( cppSettingsScoped . intelliSenseCachePath , this . AdditionalEnvironment ) ,
15441547 codeAnalysis : {
15451548 ...vscode . workspace . getConfiguration ( "C_Cpp.codeAnalysis" , this . RootUri ) ,
15461549 clangTidy : {
1547- ...vscode . workspace . getConfiguration ( "C_Cpp.codeAnalysis.clangTidy" , this . RootUri ) ,
1550+ ...clangTidyConfig ,
1551+ path : util . resolveVariables ( clangTidyConfig . path , this . AdditionalEnvironment ) ,
15481552 fix : {
15491553 ...vscode . workspace . getConfiguration ( "C_Cpp.codeAnalysis.clangTidy.fix" , this . RootUri )
15501554 } ,
You can’t perform that action at this time.
0 commit comments