Merge branch 'main' into seanmcm/localization2

Author: sean-mcmanus

.github/actions/package-lock.json

@@ -15,7 +15,7 @@
     "@octokit/rest": "^19.0.3",
     "@slack/web-api": "^6.9.1",
     "applicationinsights": "^2.5.1",
-    "axios": "^1.6.8",
+    "axios": "^1.8.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

.github/actions/package.json

@@ -46,6 +46,9 @@ typings/**
 import_edge_strings.js
 localized_string_ids.h
 translations_auto_pr.js
+readme.developer.md
+Reinstalling the Extension.md
+*.d.ts
 
 # ignore i18n language files
 i18n/**

Extension/.vscodeignore

@@ -23,6 +23,9 @@
     },
     "homepage": "https://github.com/Microsoft/vscode-cpptools",
     "qna": "https://github.com/Microsoft/vscode-cpptools/issues",
+    "extensionKind": [
+        "workspace"
+    ],
     "keywords": [
         "C",
         "C++",
@@ -1861,6 +1864,7 @@
                                 "bugprone-assert-side-effect",
                                 "bugprone-assignment-in-if-condition",
                                 "bugprone-bad-signal-to-kill-thread",
+                                "bugprone-bitwise-pointer-cast",
                                 "bugprone-bool-pointer-implicit-conversion",
                                 "bugprone-branch-clone",
                                 "bugprone-casting-through-void",
@@ -1881,6 +1885,7 @@
                                 "bugprone-inc-dec-in-conditions",
                                 "bugprone-incorrect-*",
                                 "bugprone-incorrect-enable-if",
+                                "bugprone-incorrect-enable-shared-from-this",
                                 "bugprone-incorrect-roundings",
                                 "bugprone-infinite-loop",
                                 "bugprone-integer-division",
@@ -1899,6 +1904,7 @@
                                 "bugprone-narrowing-conversions",
                                 "bugprone-no-escape",
                                 "bugprone-non-zero-enum-to-bool-conversion",
+                                "bugprone-nondeterministic-pointer-iteration-order",
                                 "bugprone-not-null-terminated-result",
                                 "bugprone-optional-value-conversion",
                                 "bugprone-parent-virtual-call",
@@ -1932,6 +1938,7 @@
                                 "bugprone-suspicious-stringview-data-usage",
                                 "bugprone-swapped-arguments",
                                 "bugprone-switch-missing-default-case",
+                                "bugprone-tagged-union-member-count",
                                 "bugprone-terminating-continue",
                                 "bugprone-throw-keyword-missing",
                                 "bugprone-too-small-loop-variable",
@@ -2323,6 +2330,7 @@
                                 "modernize-use-equals-*",
                                 "modernize-use-equals-default",
                                 "modernize-use-equals-delete",
+                                "modernize-use-integer-sign-comparison",
                                 "modernize-use-nodiscard",
                                 "modernize-use-noexcept",
                                 "modernize-use-nullptr",
@@ -2382,6 +2390,7 @@
                                 "portability-restrict-system-includes",
                                 "portability-simd-intrinsics",
                                 "portability-std-allocator-const",
+                                "portability-template-virtual-member-function",
                                 "readability-*",
                                 "readability-avoid-*",
                                 "readability-avoid-const-params-in-decls",
@@ -2515,6 +2524,7 @@
                                 "bugprone-assert-side-effect",
                                 "bugprone-assignment-in-if-condition",
                                 "bugprone-bad-signal-to-kill-thread",
+                                "bugprone-bitwise-pointer-cast",
                                 "bugprone-bool-pointer-implicit-conversion",
                                 "bugprone-branch-clone",
                                 "bugprone-casting-through-void",
@@ -2535,6 +2545,7 @@
                                 "bugprone-inc-dec-in-conditions",
                                 "bugprone-incorrect-*",
                                 "bugprone-incorrect-enable-if",
+                                "bugprone-incorrect-enable-shared-from-this",
                                 "bugprone-incorrect-roundings",
                                 "bugprone-infinite-loop",
                                 "bugprone-integer-division",
@@ -2553,6 +2564,7 @@
                                 "bugprone-narrowing-conversions",
                                 "bugprone-no-escape",
                                 "bugprone-non-zero-enum-to-bool-conversion",
+                                "bugprone-nondeterministic-pointer-iteration-order",
                                 "bugprone-not-null-terminated-result",
                                 "bugprone-optional-value-conversion",
                                 "bugprone-parent-virtual-call",
@@ -2586,6 +2598,7 @@
                                 "bugprone-suspicious-stringview-data-usage",
                                 "bugprone-swapped-arguments",
                                 "bugprone-switch-missing-default-case",
+                                "bugprone-tagged-union-member-count",
                                 "bugprone-terminating-continue",
                                 "bugprone-throw-keyword-missing",
                                 "bugprone-too-small-loop-variable",
@@ -2977,6 +2990,7 @@
                                 "modernize-use-equals-*",
                                 "modernize-use-equals-default",
                                 "modernize-use-equals-delete",
+                                "modernize-use-integer-sign-comparison",
                                 "modernize-use-nodiscard",
                                 "modernize-use-noexcept",
                                 "modernize-use-nullptr",
@@ -3036,6 +3050,7 @@
                                 "portability-restrict-system-includes",
                                 "portability-simd-intrinsics",
                                 "portability-std-allocator-const",
+                                "portability-template-virtual-member-function",
                                 "readability-*",
                                 "readability-avoid-*",
                                 "readability-avoid-const-params-in-decls",

Extension/package.json

@@ -554,6 +554,7 @@ export interface ChatContextResult {
     compiler: string;
     targetPlatform: string;
     targetArchitecture: string;
+    usedTestFrameworks: string[];
 }
 
 interface FolderFilesEncodingChanged {

Extension/src/LanguageServer/client.ts

@@ -379,7 +379,7 @@ export function publishCodeAnalysisDiagnostics(params: PublishCodeAnalysisDiagno
                     docPage = `checks${checksGroup}/${checksPage}.html`;
                 }
                 // TODO: This should be checking the clang-tidy version used to better support usage of older versions.
-                const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/19.1.0/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
+                const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/20.1.0/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
                 diagnostic.code = { value: identifier.code, target: primaryDocUri };
 
                 if (new CppSettings().clangTidyCodeActionShowDocumentation) {

Extension/src/LanguageServer/codeAnalysis.ts

@@ -23,12 +23,13 @@ class DefaultValueFallback extends Error {
 
 class CancellationError extends Error {
     static readonly Canceled = "Canceled";
-    constructor() { super(CancellationError.Canceled); }
+    constructor() {
+        super(CancellationError.Canceled);
+        this.name = this.message;
+    }
 }
 
-class InternalCancellationError extends Error {
-    static readonly Canceled = "CpptoolsCanceled";
-    constructor() { super(InternalCancellationError.Canceled); }
+class InternalCancellationError extends CancellationError {
 }
 
 class CopilotCancellationError extends CancellationError {

Extension/src/LanguageServer/copilotCompletionContextProvider.ts

@@ -168,7 +168,10 @@ export class CppConfigurationLanguageModelTool implements vscode.LanguageModelTo
                 contextString += `The project targets the ${chatContext.targetArchitecture} architecture. `;
                 telemetryProperties["targetArchitecture"] = chatContext.targetArchitecture;
             }
-
+            if (chatContext.usedTestFrameworks.length > 0) {
+                contextString += `The project uses the following C++ test frameworks: ${chatContext.usedTestFrameworks.join(', ')}. `;
+                telemetryProperties["testFrameworks"] = chatContext.usedTestFrameworks.join(', ');
+            }
             return contextString;
         }
         catch {

Extension/src/LanguageServer/lmTool.ts

@@ -480,5 +480,6 @@
     "refactor_extract_missing_return": "In the selected code, some control paths exit without setting the return value. This is supported only for scalar, numeric, and pointer return types.",
     "expand_selection": "Expand selection (to enable 'Extract to function')",
     "file_not_found_in_path2": "\"{0}\" not found in compile_commands.json files. 'includePath' from c_cpp_properties.json in folder '{1}' will be used for this file instead.",
-    "copilot_hover_link": "Generate Copilot summary"
+    "copilot_hover_link": "Generate Copilot summary",
+    "browse_path_not_found": "Unable to index files from non-existent folder: {0}"
 }

Extension/src/nativeStrings.json

@@ -130,8 +130,8 @@ describe('CppConfigurationLanguageModelTool Tests', () => {
     });
 
     const arrangeChatContextFromCppTools = ({ chatContextFromCppTools, isCpp, isHeaderFile }:
-    { chatContextFromCppTools?: ChatContextResult; isCpp?: boolean; isHeaderFile?: boolean } =
-    { chatContextFromCppTools: undefined, isCpp: undefined, isHeaderFile: false }
+        { chatContextFromCppTools?: ChatContextResult; isCpp?: boolean; isHeaderFile?: boolean } =
+        { chatContextFromCppTools: undefined, isCpp: undefined, isHeaderFile: false }
     ) => {
         activeClientStub.getChatContext.resolves(chatContextFromCppTools);
         sinon.stub(util, 'isCpp').returns(isCpp ?? true);
@@ -145,7 +145,8 @@ describe('CppConfigurationLanguageModelTool Tests', () => {
                 standardVersion: 'c++20',
                 compiler: 'msvc',
                 targetPlatform: 'windows',
-                targetArchitecture: 'x64'
+                targetArchitecture: 'x64',
+                usedTestFrameworks: ['GTest', 'Catch2']
             }
         });
 
@@ -157,12 +158,14 @@ describe('CppConfigurationLanguageModelTool Tests', () => {
             "compiler": 'MSVC',
             "standardVersion": 'C++20',
             "targetPlatform": 'Windows',
-            "targetArchitecture": 'x64'
+            "targetArchitecture": 'x64',
+            'testFrameworks': 'GTest, Catch2'
         })));
         ok(result, 'result should not be undefined');
         const text = result.content[0] as vscode.LanguageModelTextPart;
         ok(text, 'result should contain a text part');
-        ok(text.value === 'The user is working on a C++ project. The project uses language version C++20. The project compiles using the MSVC compiler. The project targets the Windows platform. The project targets the x64 architecture. ');
+        const traits_text = `The user is working on a C++ project. The project uses language version C++20. The project compiles using the MSVC compiler. The project targets the Windows platform. The project targets the x64 architecture. The project uses the following C++ test frameworks: GTest, Catch2. `;
+        ok(text.value === traits_text);
     });
 
     const testGetProjectContext = async ({
@@ -184,7 +187,8 @@ describe('CppConfigurationLanguageModelTool Tests', () => {
                 standardVersion: 'c++20',
                 compiler: compiler,
                 targetPlatform: 'windows',
-                targetArchitecture: 'x64'
+                targetArchitecture: 'x64',
+                usedTestFrameworks: []
             }
         });
 
@@ -225,7 +229,8 @@ describe('CppConfigurationLanguageModelTool Tests', () => {
                 standardVersion: 'gnu++17',
                 compiler: 'javac',
                 targetPlatform: 'arduino',
-                targetArchitecture: 'bar'
+                targetArchitecture: 'bar',
+                usedTestFrameworks: []
             }
         });
         const telemetryProperties: Record<string, string> = {};