Merge branch 'main' into seanmcm/devbox2-wsl/agent164/clang-tidy-include-mappings

Author: sean-mcmanus

.github/actions/package-lock.json

@@ -1055,6 +1055,12 @@
                         "description": "%c_cpp.configuration.hover.description%",
                         "scope": "resource"
                     },
+                    "C_Cpp.hoverShowIntegralValuesInHexadecimal": {
+                        "type": "boolean",
+                        "default": false,
+                        "markdownDescription": "%c_cpp.configuration.hoverShowIntegralValuesInHexadecimal.markdownDescription%",
+                        "scope": "resource"
+                    },
                     "C_Cpp.errorSquiggles": {
                         "type": "string",
                         "enum": [

Extension/package.json

@@ -779,6 +779,12 @@
     "c_cpp.configuration.markdownInComments.enabled.description": "Enable all markdown features in the hover tooltip.",
     "c_cpp.configuration.markdownInComments.disabled.description": "Disable all markdown features in the hover tooltip.",
     "c_cpp.configuration.hover.description": "If disabled, hover details are no longer provided by the language server.",
+    "c_cpp.configuration.hoverShowIntegralValuesInHexadecimal.markdownDescription": {
+        "message": "Displays integral constant values in hexadecimal in IntelliSense hovers. This setting only applies if `#C_Cpp.intelliSenseEngine#` is set to `default`.",
+        "comment": [
+            "Markdown text between `` should not be translated or localized (it represents literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
+        ]
+    },
     "c_cpp.configuration.vcpkg.enabled.markdownDescription": {
         "message": "Enable integration services for the [vcpkg dependency manager](https://aka.ms/vcpkg/).",
         "comment": [

Extension/package.nls.json

@@ -55,6 +55,7 @@ import { CustomConfigurationProvider1, getCustomConfigProviders, isSameProviderE
 import { DataBinding } from './dataBinding';
 import { cachedEditorConfigSettings, getEditorConfigSettings } from './editorConfig';
 import { CppSourceStr, clients, configPrefix, initializeIntervalTimer, isWritingCrashCallStack, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
+import { IncludeCleanupPreferences, getIncludeCleanupPreferences } from './includeCleanupEditorConfig';
 import { InactiveRegion, InactiveRegionStore, getInactiveRegionStartLines } from './inactiveRegions';
 import { LanguageClient } from './languageClient';
 import { LocalizeStringParams, getLocaleId, getLocalizedString } from './localization';
@@ -507,6 +508,7 @@ interface TagParseStatus {
 interface VisibleEditorInfo {
     visibleRanges: Range[];
     originalEncoding: string;
+    includeCleanupPreferences: IncludeCleanupPreferences;
 }
 
 interface DidChangeVisibleTextEditorsParams {
@@ -1503,6 +1505,7 @@ export class DefaultClient implements Client {
             clangTidyChecksDisabled: settings.clangTidyChecksDisabled,
             markdownInComments: settings.markdownInComments,
             hover: settings.hover,
+            hoverShowIntegralValuesInHexadecimal: settings.hoverShowIntegralValuesInHexadecimal,
             vcFormatIndentBraces: settings.vcFormatIndentBraces,
             vcFormatIndentMultiLineRelativeTo: settings.vcFormatIndentMultiLineRelativeTo,
             vcFormatIndentWithinParentheses: settings.vcFormatIndentWithinParentheses,
@@ -1953,9 +1956,11 @@ export class DefaultClient implements Client {
             // First, we just concat all ranges for the same file.
             const uri: string = editor.document.uri.toString();
             if (!visibileEditorInfo[uri]) {
+                const editorConfigSettings: any = getEditorConfigSettings(editor.document.uri.fsPath);
                 visibileEditorInfo[uri] = {
                     visibleRanges: [],
-                    originalEncoding: editor.document.encoding
+                    originalEncoding: editor.document.encoding,
+                    includeCleanupPreferences: getIncludeCleanupPreferences(editorConfigSettings)
                 };
             }
             visibileEditorInfo[uri].visibleRanges = visibileEditorInfo[uri].visibleRanges.concat(editor.visibleRanges.map(makeLspRange));
@@ -2714,6 +2719,15 @@ export class DefaultClient implements Client {
 
     private associations_for_did_change?: Set<string>;
 
+    private refreshEditorConfigSettings(): void {
+        cachedEditorConfigSettings.clear();
+        cachedEditorConfigLookups.clear();
+        this.updateActiveDocumentTextOptions();
+
+        const cppEditors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(editor => util.isCpp(editor.document));
+        void this.onDidChangeVisibleTextEditors(cppEditors).catch(logAndReturn.undefined);
+    }
+
     /**
      * listen for file created/deleted events under the ${workspaceFolder} folder
      */
@@ -2734,9 +2748,7 @@ export class DefaultClient implements Client {
                 }
                 const fileName: string = path.basename(uri.fsPath).toLowerCase();
                 if (fileName === ".editorconfig") {
-                    cachedEditorConfigSettings.clear();
-                    cachedEditorConfigLookups.clear();
-                    this.updateActiveDocumentTextOptions();
+                    this.refreshEditorConfigSettings();
                 }
                 if (fileName === ".clang-format" || fileName === "_clang-format") {
                     cachedEditorConfigLookups.clear();
@@ -2762,9 +2774,7 @@ export class DefaultClient implements Client {
                 const dotIndex: number = uri.fsPath.lastIndexOf('.');
                 const fileName: string = path.basename(uri.fsPath).toLowerCase();
                 if (fileName === ".editorconfig") {
-                    cachedEditorConfigSettings.clear();
-                    cachedEditorConfigLookups.clear();
-                    this.updateActiveDocumentTextOptions();
+                    this.refreshEditorConfigSettings();
                 }
                 const ext: string | undefined = dotIndex !== -1 ? uri.fsPath.substring(dotIndex + 1) : undefined;
                 const isTrackedFile: boolean = hasNativeFileTypeMappings()
@@ -2789,8 +2799,7 @@ export class DefaultClient implements Client {
                 }
                 const fileName: string = path.basename(uri.fsPath).toLowerCase();
                 if (fileName === ".editorconfig") {
-                    cachedEditorConfigSettings.clear();
-                    cachedEditorConfigLookups.clear();
+                    this.refreshEditorConfigSettings();
                 }
                 if (fileName === ".clang-format" || fileName === "_clang-format") {
                     cachedEditorConfigLookups.clear();

Extension/src/LanguageServer/client.ts

@@ -0,0 +1,33 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+export interface IncludeCleanupPreferences {
+    alternateFiles: string;
+    excludedFiles: string;
+    replacementFiles: string;
+    requiredFiles: string;
+}
+
+function normalizeSettingKeys(settings: any): Record<string, unknown> {
+    return Object.fromEntries(Object.entries(settings ?? {}).map(([key, value]) => [key.toLowerCase(), value]));
+}
+
+function getStringSetting(settings: Record<string, unknown>, key: string): string {
+    const value: unknown = settings?.[key];
+    if (typeof value !== 'string' || value.toLowerCase() === 'unset') {
+        return '';
+    }
+    return value;
+}
+
+export function getIncludeCleanupPreferences(settings: any): IncludeCleanupPreferences {
+    const normalizedSettings: Record<string, unknown> = normalizeSettingKeys(settings);
+    return {
+        alternateFiles: getStringSetting(normalizedSettings, 'cpp_include_cleanup_alternate_files'),
+        excludedFiles: getStringSetting(normalizedSettings, 'cpp_include_cleanup_excluded_files'),
+        replacementFiles: getStringSetting(normalizedSettings, 'cpp_include_cleanup_replacement_files'),
+        requiredFiles: getStringSetting(normalizedSettings, 'cpp_include_cleanup_required_files')
+    };
+}

Extension/src/LanguageServer/includeCleanupEditorConfig.ts

@@ -71,6 +71,7 @@ export interface WorkspaceFolderSettingsParams {
     clangTidyChecksEnabled: string[] | undefined;
     clangTidyChecksDisabled: string[] | undefined;
     hover: string;
+    hoverShowIntegralValuesInHexadecimal: boolean;
     markdownInComments: string;
     vcFormatIndentBraces: boolean;
     vcFormatIndentMultiLineRelativeTo: string;
@@ -488,6 +489,7 @@ export class CppSettings extends Settings {
     public get isCaseSensitiveFileSupportEnabled(): boolean { return !isWindows || this.getAsString("caseSensitiveFileSupport").toLowerCase() === "enabled"; }
     public get doxygenSectionTags(): string[] { return this.getAsArrayOfStrings("doxygen.sectionTags"); }
     public get hover(): string { return this.getAsString("hover"); }
+    public get hoverShowIntegralValuesInHexadecimal(): boolean { return this.getAsBoolean("hoverShowIntegralValuesInHexadecimal"); }
     public get markdownInComments(): string { return this.getAsString("markdownInComments"); }
     public get legacyCompilerArgsBehavior(): boolean { return this.getAsBoolean("legacyCompilerArgsBehavior"); }
     public get inlayHintsAutoDeclarationTypes(): boolean { return this.getAsBoolean("inlayHints.autoDeclarationTypes.enabled"); }

Extension/src/LanguageServer/settings.ts

@@ -797,5 +797,25 @@
     "quick_info_alignment": {
         "text": "**Alignment:** %s B",
         "hint": "Alignment of a C or C++ type in bytes. %s is the numeric alignment. Translate B to a count-invariant byte unit symbol or abbreviation. {Locked=\"**\"} {Locked=\"%s\"}"
+    },
+    "help_allow_missing_workspace_config": {
+        "text": "Allow the server to start even when the specified workspace config file does not exist.",
+        "hint": "Describes the --allow-missing-workspace-config command-line option."
+    },
+    "help_deprecated_lsp_config": {
+        "text": "Deprecated alias for --workspace-config.",
+        "hint": "{Locked=\"--workspace-config\"}"
+    },
+    "help_deprecated_allow_missing_lsp_config": {
+        "text": "Deprecated alias for --allow-missing-workspace-config.",
+        "hint": "{Locked=\"--allow-missing-workspace-config\"}"
+    },
+    "error_conflicting_config_args": {
+        "text": "--workspace-config cannot be combined with --lsp-config.",
+        "hint": "Error shown when both configuration arguments are supplied. {Locked=\"--workspace-config\"} {Locked=\"--lsp-config\"}"
+    },
+    "error_config_arg_requires_path": {
+        "text": "{0} requires a path.",
+        "hint": "Error shown when a configuration argument is not followed by a path. {0} is the command-line option name. {Locked=\"{0}\"}"
     }
 }