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

Author: Colengms

Extension/src/LanguageServer/configurations.ts

@@ -120,8 +120,6 @@ export interface CompilerDefaults {
     knownCompilers: KnownCompiler[];
     cStandard: string;
     cppStandard: string;
-    includes: string[];
-    frameworks: string[];
     windowsSdkVersion: string;
     intelliSenseMode: string;
     trustedCompilerFound: boolean;
@@ -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[] = [];
@@ -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;
@@ -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);
@@ -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;
         }
@@ -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