Skip to content

Add IsExplicit for new recursive include properties #13480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2025
Merged

Add IsExplicit for new recursive include properties #13480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a83a28e
Add IsExplicit fields for new recursive include properties
Colengms Apr 9, 2025
b7f1bec
Merge branch 'main' into coleng/add_is_explicit_for_recursive_includes
Colengms Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion Extension/src/LanguageServer/configurations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ export interface Configuration {
browse?: Browse;
recursiveIncludes?: RecursiveIncludes;
customConfigurationVariables?: { [key: string]: string };
recursiveIncludesReduceIsExplicit?: boolean;
recursiveIncludesPriorityIsExplicit?: boolean;
recursiveIncludesOrderIsExplicit?: boolean;
}

export interface ConfigurationErrors {
Expand Down Expand Up @@ -940,8 +943,11 @@ export class CppProperties {
configuration.recursiveIncludes = {};
}
configuration.recursiveIncludes.reduce = this.updateConfigurationString(configuration.recursiveIncludes.reduce, settings.defaultRecursiveIncludesReduce);
configuration.recursiveIncludesReduceIsExplicit = configuration.recursiveIncludesReduceIsExplicit || settings.defaultRecursiveIncludesReduce !== "";
configuration.recursiveIncludes.priority = this.updateConfigurationString(configuration.recursiveIncludes.priority, settings.defaultRecursiveIncludesPriority);
configuration.recursiveIncludesPriorityIsExplicit = configuration.recursiveIncludesPriorityIsExplicit || settings.defaultRecursiveIncludesPriority !== "";
configuration.recursiveIncludes.order = this.updateConfigurationString(configuration.recursiveIncludes.order, settings.defaultRecursiveIncludesOrder);
configuration.recursiveIncludesOrderIsExplicit = configuration.recursiveIncludesOrderIsExplicit || settings.defaultRecursiveIncludesOrder !== "";
if (!configuration.compileCommands) {
// compile_commands.json already specifies a compiler. compilerPath overrides the compile_commands.json compiler so
// don't set a default when compileCommands is in use.
Expand Down Expand Up @@ -1508,7 +1514,10 @@ export class CppProperties {
if ((this.configurationJson.configurations[i].compilerPathIsExplicit !== undefined)
|| (this.configurationJson.configurations[i].cStandardIsExplicit !== undefined)
|| (this.configurationJson.configurations[i].cppStandardIsExplicit !== undefined)
|| (this.configurationJson.configurations[i].intelliSenseModeIsExplicit !== undefined)) {
|| (this.configurationJson.configurations[i].intelliSenseModeIsExplicit !== undefined)
|| (this.configurationJson.configurations[i].recursiveIncludesReduceIsExplicit !== undefined)
|| (this.configurationJson.configurations[i].recursiveIncludesPriorityIsExplicit !== undefined)
|| (this.configurationJson.configurations[i].recursiveIncludesOrderIsExplicit !== undefined)) {
dirty = true;
break;
}
Expand All @@ -1529,6 +1538,9 @@ export class CppProperties {
e.cStandardIsExplicit = e.cStandard !== undefined;
e.cppStandardIsExplicit = e.cppStandard !== undefined;
e.intelliSenseModeIsExplicit = e.intelliSenseMode !== undefined;
e.recursiveIncludesReduceIsExplicit = e.recursiveIncludes?.reduce !== undefined;
e.recursiveIncludesPriorityIsExplicit = e.recursiveIncludes?.priority !== undefined;
e.recursiveIncludesOrderIsExplicit = e.recursiveIncludes?.order !== undefined;
});

} catch (errJS) {
Expand Down Expand Up @@ -2296,6 +2308,9 @@ export class CppProperties {
const savedCStandardIsExplicit: boolean[] = [];
const savedCppStandardIsExplicit: boolean[] = [];
const savedIntelliSenseModeIsExplicit: boolean[] = [];
const savedRecursiveIncludesReduceIsExplicit: boolean[] = [];
const savedRecursiveIncludesPriorityIsExplicit: boolean[] = [];
const savedRecursiveIncludesOrderIsExplicit: boolean[] = [];

if (this.configurationJson) {
this.configurationJson.configurations.forEach(e => {
Expand All @@ -2315,6 +2330,18 @@ export class CppProperties {
if (e.intelliSenseModeIsExplicit !== undefined) {
delete e.intelliSenseModeIsExplicit;
}
savedRecursiveIncludesReduceIsExplicit.push(!!e.recursiveIncludesReduceIsExplicit);
if (e.recursiveIncludesReduceIsExplicit !== undefined) {
delete e.recursiveIncludesReduceIsExplicit;
}
savedRecursiveIncludesPriorityIsExplicit.push(!!e.recursiveIncludesPriorityIsExplicit);
if (e.recursiveIncludesPriorityIsExplicit !== undefined) {
delete e.recursiveIncludesPriorityIsExplicit;
}
savedRecursiveIncludesOrderIsExplicit.push(!!e.recursiveIncludesOrderIsExplicit);
if (e.recursiveIncludesOrderIsExplicit !== undefined) {
delete e.recursiveIncludesOrderIsExplicit;
}
});
}

Expand All @@ -2329,6 +2356,9 @@ export class CppProperties {
this.configurationJson.configurations[i].cStandardIsExplicit = savedCStandardIsExplicit[i];
this.configurationJson.configurations[i].cppStandardIsExplicit = savedCppStandardIsExplicit[i];
this.configurationJson.configurations[i].intelliSenseModeIsExplicit = savedIntelliSenseModeIsExplicit[i];
this.configurationJson.configurations[i].recursiveIncludesReduceIsExplicit = savedRecursiveIncludesReduceIsExplicit[i];
this.configurationJson.configurations[i].recursiveIncludesPriorityIsExplicit = savedRecursiveIncludesPriorityIsExplicit[i];
this.configurationJson.configurations[i].recursiveIncludesOrderIsExplicit = savedRecursiveIncludesOrderIsExplicit[i];
}
}
}
Expand Down