Merge branch 'main' into seanmcm/removeAlwaysAuth

Author: sean-mcmanus

.github/actions/package-lock.json

@@ -11,8 +11,8 @@
   "author": "",
   "dependencies": {
     "@actions/core": "^1.9.1",
-    "@actions/github": "^5.0.3",
-    "@octokit/rest": "^19.0.3",
+    "@actions/github": "^6.0.0",
+    "@octokit/rest": "^21.1.1",
     "@slack/web-api": "^6.9.1",
     "applicationinsights": "^2.5.1",
     "axios": "^1.8.2",

.github/actions/package.json

@@ -180,7 +180,10 @@
                     "mergeConfigurations": {
                         "markdownDescription": "Set to `true` to merge include paths, defines, and forced includes with those from a configuration provider.",
                         "descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
-                        "type": "boolean"
+                        "type": [
+                            "boolean",
+                            "string"
+                        ]
                     },
                     "browse": {
                         "type": "object",
@@ -208,6 +211,42 @@
                         },
                         "additionalProperties": false
                     },
+                    "recursiveIncludes": {
+                        "type": "object",
+                        "properties": {
+                            "reduce": {
+                                "markdownDescription": "Set to `always` to always reduce the number of recursive include paths provided to IntelliSense to only those paths currently referenced by #include statements. This requires first parsing files to determine which headers are included. Set to `never` to provide all recursive include paths to IntelliSense. Reducing the number of recursive include paths may improve IntelliSense performance when a very large number of recursive include paths are involved. Not reducing the number of recursive include paths can improve IntelliSense performance by avoiding the need to parse files to determine which include paths to provide. The `default` value is currently to reduce the number of recursive include paths provided to IntelliSense.",
+                                "descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
+                                "type": "string",
+                                "enum": [
+                                    "always",
+                                    "never",
+                                    "default",
+                                    "${default}"
+                                ]
+                            },
+                            "priority": {
+                                "markdownDescription": "The priority of recursive include paths. If set to `beforeSystemIncludes`, the recursive include paths will be searched before system include paths. If set to `afterSystemIncludes`, the recursive include paths will be searched after system include paths. `beforeSystemIncludes` would more closely reflect the search order of a compiler, while `afterSystemIncludes` may result in improved performance.",
+                                "descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
+                                "type": "string",
+                                "enum": [
+                                    "beforeSystemIncludes",
+                                    "afterSystemIncludes",
+                                    "${default}"
+                                ]
+                            },
+                            "order": {
+                                "markdownDescription": "The order in which subdirectories of recursive includes are searched.",
+                                "type": "string",
+                                "enum": [
+                                    "depthFirst",
+                                    "breadthFirst",
+                                    "${default}"
+                                ]
+                            }
+                        },
+                        "additionalProperties": false
+                    },
                     "customConfigurationVariables": {
                         "type": "object",
                         "markdownDescription": "Custom variables that can be queried through the command `${cpptools:activeConfigCustomVariable}` to use for the input variables in `launch.json` or `tasks.json`.",

Extension/c_cpp_properties.schema.json

@@ -897,6 +897,37 @@
                         "markdownDescription": "%c_cpp.configuration.default.dotConfig.markdownDescription%",
                         "scope": "resource"
                     },
+                    "C_Cpp.default.recursiveIncludes.reduce": {
+                        "type": "string",
+                        "enum": [
+                            "always",
+                            "never",
+                            "default"
+                        ],
+                        "default": "default",
+                        "markdownDescription": "%c_cpp.configuration.default.recursiveIncludes.reduce.markdownDescription%",
+                        "scope": "resource"
+                    },
+                    "C_Cpp.default.recursiveIncludes.priority": {
+                        "type": "string",
+                        "enum": [
+                            "beforeSystemIncludes",
+                            "afterSystemIncludes"
+                        ],
+                        "default": "afterSystemIncludes",
+                        "markdownDescription": "%c_cpp.configuration.default.recursiveIncludes.priority.markdownDescription%",
+                        "scope": "resource"
+                    },
+                    "C_Cpp.default.recursiveIncludes.order": {
+                        "type": "string",
+                        "enum": [
+                            "depthFirst",
+                            "breadthFirst"
+                        ],
+                        "default": "depthFirst",
+                        "markdownDescription": "%c_cpp.configuration.default.recursiveIncludes.order.markdownDescription%",
+                        "scope": "resource"
+                    },
                     "C_Cpp.configurationWarnings": {
                         "type": "string",
                         "enum": [
@@ -3339,7 +3370,8 @@
                         "type": "string",
                         "enum": [
                             "default",
-                            "disabled"
+                            "disabled",
+                            "enabled"
                         ],
                         "default": "default",
                         "markdownDescription": "%c_cpp.configuration.copilotHover.markdownDescription%",

Extension/package.json

@@ -682,7 +682,7 @@
         ]
     },
     "c_cpp.configuration.default.mergeConfigurations.markdownDescription": {
-        "message": "Set to `true` to merge include paths, defines, and forced includes with those from a configuration provider.",
+        "message": "The value to use in a configuration if `mergeConfigurations` is either not specified or set to `${default}`.",
         "comment": [
             "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
         ]
@@ -724,7 +724,25 @@
         ]
     },
     "c_cpp.configuration.default.dotConfig.markdownDescription": {
-        "message": "The value to use in a configuration if `dotConfig` is not specified, or the value to insert if `${default}` is present in `dotConfig`.",
+        "message": "The value to use in a configuration if `dotConfig` is either not specified or set to `${default}`.",
+        "comment": [
+            "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+        ]
+    },
+    "c_cpp.configuration.default.recursiveIncludes.reduce.markdownDescription": {
+        "message": "The value to use in a configuration if `recursiveIncludes.reduce` is either not specified or set to `${default}`.",
+        "comment": [
+            "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+        ]
+    },
+    "c_cpp.configuration.default.recursiveIncludes.priority.markdownDescription": {
+        "message": "The value to use in a configuration if `recursiveIncludes.priority` is either not specified or set to `${default}`.",
+        "comment": [
+            "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+        ]
+    },
+    "c_cpp.configuration.default.recursiveIncludes.order.markdownDescription": {
+        "message": "The value to use in a configuration if `recursiveIncludes.order` is either not specified or set to `${default}`.",
         "comment": [
             "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
         ]

Extension/package.nls.json

@@ -33,7 +33,10 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
         await this.client.ready;
 
         const settings: CppSettings = new CppSettings(vscode.workspace.getWorkspaceFolder(document.uri)?.uri);
-        if (settings.hover === "disabled") {
+        if (settings.hover === "disabled" ||
+            settings.copilotHover === "disabled" ||
+            (settings.copilotHover === "default" && await telemetry.isFlightEnabled("CppCopilotHoverDisabled"))) {
+            // Either disabled by the user or by the flight.
             return undefined;
         }
 
@@ -46,13 +49,6 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
             }
         }
 
-        if (new CppSettings().copilotHover === "default") {
-            // Check flight to make sure the feature is enabled.
-            if (!await telemetry.isFlightEnabled("CppCopilotHover")) {
-                return undefined;
-            }
-        }
-
         const newHover = this.isNewHover(document, position);
         if (newHover) {
             this.reset();

Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts

@@ -1332,17 +1332,9 @@ export class DefaultClient implements Client {
                 initializedClientCount = 0;
                 this.inlayHintsProvider = new InlayHintsProvider();
                 this.hoverProvider = new HoverProvider(this);
+                this.copilotHoverProvider = new CopilotHoverProvider(this);
 
-                const settings: CppSettings = new CppSettings();
-                this.currentCopilotHoverEnabled = new PersistentWorkspaceState<string>("cpp.copilotHover", settings.copilotHover);
-                if (settings.copilotHover !== "disabled") {
-                    this.copilotHoverProvider = new CopilotHoverProvider(this);
-                    this.disposables.push(vscode.languages.registerHoverProvider(util.documentSelector, instrument(this.copilotHoverProvider)));
-                }
-
-                if (settings.copilotHover !== this.currentCopilotHoverEnabled.Value) {
-                    this.currentCopilotHoverEnabled.Value = settings.copilotHover;
-                }
+                this.disposables.push(vscode.languages.registerHoverProvider(util.documentSelector, instrument(this.copilotHoverProvider)));
                 this.disposables.push(vscode.languages.registerHoverProvider(util.documentSelector, instrument(this.hoverProvider)));
                 this.disposables.push(vscode.languages.registerInlayHintsProvider(util.documentSelector, instrument(this.inlayHintsProvider)));
                 this.disposables.push(vscode.languages.registerRenameProvider(util.documentSelector, instrument(new RenameProvider(this))));
@@ -1362,6 +1354,7 @@ export class DefaultClient implements Client {
                 this.codeFoldingProvider = new FoldingRangeProvider(this);
                 this.codeFoldingProviderDisposable = vscode.languages.registerFoldingRangeProvider(util.documentSelector, instrument(this.codeFoldingProvider));
 
+                const settings: CppSettings = new CppSettings();
                 if (settings.isEnhancedColorizationEnabled && semanticTokensLegend) {
                     this.semanticTokensProvider = instrument(new SemanticTokensProvider());
                     this.semanticTokensProviderDisposable = vscode.languages.registerDocumentSemanticTokensProvider(util.documentSelector, this.semanticTokensProvider, semanticTokensLegend);

Extension/src/LanguageServer/client.ts

@@ -83,8 +83,9 @@ export interface Configuration {
     forcedInclude?: string[];
     configurationProviderInCppPropertiesJson?: string;
     configurationProvider?: string;
-    mergeConfigurations?: boolean;
+    mergeConfigurations?: boolean | string;
     browse?: Browse;
+    recursiveIncludes?: RecursiveIncludes;
     customConfigurationVariables?: { [key: string]: string };
 }
 
@@ -107,6 +108,12 @@ export interface Browse {
     databaseFilename?: string;
 }
 
+export interface RecursiveIncludes {
+    reduce?: string;
+    priority?: string;
+    order?: string;
+}
+
 export interface KnownCompiler {
     path: string;
     isC: boolean;
@@ -813,13 +820,16 @@ export class CppProperties {
         return resolvedGlob;
     }
 
-    private updateConfigurationString(property: string | undefined | null, defaultValue: string | undefined | null, env: Environment, acceptBlank?: boolean): string | undefined {
+    private updateConfigurationString(property: string | undefined | null, defaultValue: string | undefined | null, env?: Environment, acceptBlank?: boolean): string | undefined {
         if (property === null || property === undefined || property === "${default}") {
             property = defaultValue;
         }
         if (property === null || property === undefined || (acceptBlank !== true && property === "")) {
             return undefined;
         }
+        if (env === undefined) {
+            return property;
+        }
         return util.resolveVariables(property, env);
     }
 
@@ -843,29 +853,16 @@ export class CppProperties {
         return paths;
     }
 
-    private updateConfigurationStringOrBoolean(property: string | boolean | undefined | null, defaultValue: boolean | undefined | null, env: Environment): string | boolean | undefined {
-        if (!property || property === "${default}") {
-            property = defaultValue;
-        }
-        if (!property || property === "") {
-            return undefined;
-        }
-        if (typeof property === "boolean") {
-            return property;
-        }
-        return util.resolveVariables(property, env);
-    }
-
-    private updateConfigurationBoolean(property: boolean | undefined | null, defaultValue: boolean | undefined | null): boolean | undefined {
-        if (property === null || property === undefined) {
+    private updateConfigurationBoolean(property: boolean | string | undefined | null, defaultValue: boolean | undefined | null): boolean | undefined {
+        if (property === null || property === undefined || property === "${default}") {
             property = defaultValue;
         }
 
         if (property === null) {
             return undefined;
         }
 
-        return property;
+        return property === true || property === "true";
     }
 
     private updateConfigurationStringDictionary(property: { [key: string]: string } | undefined, defaultValue: { [key: string]: string } | undefined, env: Environment): { [key: string]: string } | undefined {
@@ -939,6 +936,12 @@ export class CppProperties {
             configuration.cStandardIsExplicit = configuration.cStandardIsExplicit || settings.defaultCStandard !== "";
             configuration.cppStandardIsExplicit = configuration.cppStandardIsExplicit || settings.defaultCppStandard !== "";
             configuration.mergeConfigurations = this.updateConfigurationBoolean(configuration.mergeConfigurations, settings.defaultMergeConfigurations);
+            if (!configuration.recursiveIncludes) {
+                configuration.recursiveIncludes = {};
+            }
+            configuration.recursiveIncludes.reduce = this.updateConfigurationString(configuration.recursiveIncludes.reduce, settings.defaultRecursiveIncludesReduce);
+            configuration.recursiveIncludes.priority = this.updateConfigurationString(configuration.recursiveIncludes.priority, settings.defaultRecursiveIncludesPriority);
+            configuration.recursiveIncludes.order = this.updateConfigurationString(configuration.recursiveIncludes.order, 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.
@@ -1002,7 +1005,7 @@ export class CppProperties {
                 configuration.browse.path = this.updateConfigurationPathsArray(configuration.browse.path, settings.defaultBrowsePath, env);
             }
 
-            configuration.browse.limitSymbolsToIncludedHeaders = this.updateConfigurationStringOrBoolean(configuration.browse.limitSymbolsToIncludedHeaders, settings.defaultLimitSymbolsToIncludedHeaders, env);
+            configuration.browse.limitSymbolsToIncludedHeaders = this.updateConfigurationBoolean(configuration.browse.limitSymbolsToIncludedHeaders, settings.defaultLimitSymbolsToIncludedHeaders);
             configuration.browse.databaseFilename = this.updateConfigurationString(configuration.browse.databaseFilename, settings.defaultDatabaseFilename, env);
 
             if (i === this.CurrentConfigurationIndex) {

Extension/src/LanguageServer/configurations.ts

@@ -197,7 +197,7 @@ export class CopilotCompletionContextProvider implements ContextResolver<Support
             }
             return undefined;
         } finally {
-            out.appendLine(logMessage);
+            out.appendLineAtLevel(6, logMessage);
             telemetry.send("cache");
         }
     }
@@ -341,7 +341,7 @@ ${copilotCompletionContext?.areCodeSnippetsMissing ? " missing code-snippets" :
             telemetry.addResolvedElapsed(duration);
             telemetry.addCacheSize(this.completionContextCache.size);
             telemetry.send();
-            out.appendLine(logMessage);
+            out.appendLineAtLevel(6, logMessage);
         }
     }