Skip to content

Don't use 'system' include/framework paths as fallback 'user' include/framework paths in the base config #13247

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 3 commits into from
Feb 7, 2025
Merged

Don't use 'system' include/framework paths as fallback 'user' include/framework paths in the base config #13247

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2619914
Remove system include/framework paths from config defaults
Colengms Feb 6, 2025
0da20f1
Remove the other sets of fields as well
Colengms Feb 6, 2025
74c4642
Merge branch 'main' into coleng/remove_system_includes_from_defaults
Colengms Feb 7, 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
18 changes: 1 addition & 17 deletions Extension/src/LanguageServer/configurations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ export interface CompilerDefaults {
knownCompilers: KnownCompiler[];
cStandard: string;
cppStandard: string;
includes: string[];
frameworks: string[];
windowsSdkVersion: string;
intelliSenseMode: string;
trustedCompilerFound: boolean;
Expand All @@ -143,8 +141,6 @@ export class CppProperties {
private knownCompilers?: KnownCompiler[];
private defaultCStandard: string | null = null;
private defaultCppStandard: string | null = null;
private defaultIncludes: string[] | null = null;
private defaultFrameworks?: string[];
private defaultWindowsSdkVersion: string | null = null;
private isCppPropertiesJsonVisible: boolean = false;
private vcpkgIncludes: string[] = [];
Expand Down Expand Up @@ -295,8 +291,6 @@ export class CppProperties {
this.knownCompilers = compilerDefaults.knownCompilers;
this.defaultCStandard = compilerDefaults.cStandard;
this.defaultCppStandard = compilerDefaults.cppStandard;
this.defaultIncludes = compilerDefaults.includes;
this.defaultFrameworks = compilerDefaults.frameworks;
this.defaultWindowsSdkVersion = compilerDefaults.windowsSdkVersion;
this.defaultIntelliSenseMode = compilerDefaults.intelliSenseMode !== "" ? compilerDefaults.intelliSenseMode : undefined;
this.trustedCompilerFound = compilerDefaults.trustedCompilerFound;
Expand Down Expand Up @@ -349,7 +343,7 @@ export class CppProperties {
}

private async applyDefaultIncludePathsAndFrameworks() {
if (this.configurationIncomplete && this.defaultIncludes && this.defaultFrameworks && this.vcpkgPathReady) {
if (this.configurationIncomplete && this.vcpkgPathReady) {
const configuration: Configuration | undefined = this.CurrentConfiguration;
if (configuration) {
this.applyDefaultConfigurationValues(configuration);
Expand Down Expand Up @@ -382,9 +376,6 @@ export class CppProperties {
if (isUnset(settings.defaultDefines)) {
configuration.defines = (process.platform === 'win32') ? ["_DEBUG", "UNICODE", "_UNICODE"] : [];
}
if (isUnset(settings.defaultMacFrameworkPath) && process.platform === 'darwin') {
configuration.macFrameworkPath = this.defaultFrameworks;
}
if ((isUnset(settings.defaultWindowsSdkVersion) || settings.defaultWindowsSdkVersion === "") && this.defaultWindowsSdkVersion && process.platform === 'win32') {
configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;
}
Expand Down Expand Up @@ -972,13 +963,6 @@ export class CppProperties {
if (!configuration.windowsSdkVersion && !!this.defaultWindowsSdkVersion) {
configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;
}
if (!origIncludePath && !!this.defaultIncludes) {
const includePath: string[] = configuration.includePath || [];
configuration.includePath = includePath.concat(this.defaultIncludes);
}
if (!configuration.macFrameworkPath && !!this.defaultFrameworks) {
configuration.macFrameworkPath = this.defaultFrameworks;
}
}
} else {
// add compiler to list of trusted compilers
Expand Down