Merge branch 'main' into seanmcm/removeAlwaysAuth

sean-mcmanus · web-flow · commit 17f90e59a8b8 · 2025-03-18T13:12:11.000-07:00
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,5 +1,23 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.24.3: March 18, 2025
+### Enhancements
+* Add detected test frameworks to the Copilot context when `#cpp` is used. [PR #13285](https://github.com/microsoft/vscode-cpptools/pull/13285)
+* Update clang-tidy and clang-format from 19.1.7 to 20.1.0. [PR #13348](https://github.com/microsoft/vscode-cpptools/pull/13348)
+* Remove some unnecessary files from the vsix. [PR #13368](https://github.com/microsoft/vscode-cpptools/pull/13368)
+* Improve the logging when a non-existent path is used for indexing. [PR #13372](https://github.com/microsoft/vscode-cpptools/pull/13372)
+* Remove the `C_Cpp.updateChannel` setting. [PR #13376](https://github.com/microsoft/vscode-cpptools/pull/13376)
+* Switch to only passing the root framework to clang-tidy.
+
+### Bug Fixes
+* Fix a bug with symlink resolving with `compile_commands.json`. [#13321](https://github.com/microsoft/vscode-cpptools/issues/13321)
+* Fix a performance issue on macOS when processing `compile_commands.json` with a lot of include paths. [#13366](https://github.com/microsoft/vscode-cpptools/issues/13366)
+* Fix some localization bugs. [PR #13373](https://github.com/microsoft/vscode-cpptools/pull/13373)
+* Fix IntelliSense showing the wrong size of objects. [#13375](https://github.com/microsoft/vscode-cpptools/issues/13375)
+* Fix a `${workspaceFolder}/*` include path not being used as a non-recursive browse path.
+* Fix some potential IntelliSense process crashes when processing Copilot snippets.
+* Fix a regression with compiler query caching in the database.
+
 ## Version 1.24.2: March 6, 2025
 ### Enhancements
 * Various improvements to Copilot snippets. [PR #13296](https://github.com/microsoft/vscode-cpptools/pull/13296)
diff --git a/Extension/bin/linux.clang.arm.json b/Extension/bin/linux.clang.arm.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.clang.arm64.json b/Extension/bin/linux.clang.arm64.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.clang.x64.json b/Extension/bin/linux.clang.x64.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.clang.x86.json b/Extension/bin/linux.clang.x86.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.gcc.arm.json b/Extension/bin/linux.gcc.arm.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.gcc.arm64.json b/Extension/bin/linux.gcc.arm64.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.gcc.x64.json b/Extension/bin/linux.gcc.x64.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/linux.gcc.x86.json b/Extension/bin/linux.gcc.x86.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-Dunix=1",
     "-D__unix__=1",
     "-D__linux__=1",
diff --git a/Extension/bin/macos.clang.arm.json b/Extension/bin/macos.clang.arm.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__arm__=1",
diff --git a/Extension/bin/macos.clang.arm64.json b/Extension/bin/macos.clang.arm64.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__aarch64__=1",
diff --git a/Extension/bin/macos.clang.x64.json b/Extension/bin/macos.clang.x64.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__x86_64=1",
diff --git a/Extension/bin/macos.clang.x86.json b/Extension/bin/macos.clang.x86.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
     "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__i386=1",
diff --git a/Extension/bin/macos.gcc.arm.json b/Extension/bin/macos.gcc.arm.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__arm__=1",
diff --git a/Extension/bin/macos.gcc.arm64.json b/Extension/bin/macos.gcc.arm64.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__aarch64__=1",
diff --git a/Extension/bin/macos.gcc.x64.json b/Extension/bin/macos.gcc.x64.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__x86_64=1",
diff --git a/Extension/bin/macos.gcc.x86.json b/Extension/bin/macos.gcc.x86.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8",
     "-D__APPLE__=1",
     "-D__MACH__=1",
     "-D__i386=1",
diff --git a/Extension/bin/windows.clang.arm.json b/Extension/bin/windows.clang.arm.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
-    "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8"
+    "-D__building_module(x)=0"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.clang.arm64.json b/Extension/bin/windows.clang.arm64.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
-    "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8"
+    "-D__building_module(x)=0"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.clang.x64.json b/Extension/bin/windows.clang.x64.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
-    "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8"
+    "-D__building_module(x)=0"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.clang.x86.json b/Extension/bin/windows.clang.x86.json
@@ -1,8 +1,6 @@
 {
   "defaults": [
-    "-D__building_module(x)=0",
-    "--pack_alignment",
-    "8"
+    "-D__building_module(x)=0"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.gcc.arm.json b/Extension/bin/windows.gcc.arm.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.gcc.arm64.json b/Extension/bin/windows.gcc.arm64.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.gcc.x64.json b/Extension/bin/windows.gcc.x64.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.gcc.x86.json b/Extension/bin/windows.gcc.x86.json
@@ -1,7 +1,5 @@
 {
   "defaults": [
-    "--pack_alignment",
-    "8"
   ],
   "defaults_op": "merge"
 }
diff --git a/Extension/bin/windows.msvc.arm.json b/Extension/bin/windows.msvc.arm.json
@@ -5,8 +5,6 @@
     "--microsoft_bugs",
     "--microsoft_version",
     "1943",
-    "--pack_alignment",
-    "8",
     "-D_MSC_VER=1943",
     "-D_MSC_FULL_VER=194334604",
     "-D_MSC_BUILD=0",
diff --git a/Extension/bin/windows.msvc.arm64.json b/Extension/bin/windows.msvc.arm64.json
@@ -5,8 +5,6 @@
     "--microsoft_bugs",
     "--microsoft_version",
     "1943",
-    "--pack_alignment",
-    "8",
     "-D_CPPUNWIND=1",
     "-D_MSC_VER=1943",
     "-D_MSC_FULL_VER=194334604",
diff --git a/Extension/bin/windows.msvc.x64.json b/Extension/bin/windows.msvc.x64.json
@@ -5,8 +5,6 @@
     "--microsoft_bugs",
     "--microsoft_version",
     "1943",
-    "--pack_alignment",
-    "8",
     "-D_CPPUNWIND=1",
     "-D_MSC_VER=1943",
     "-D_MSC_FULL_VER=194334604",
diff --git a/Extension/bin/windows.msvc.x86.json b/Extension/bin/windows.msvc.x86.json
@@ -5,8 +5,6 @@
     "--microsoft_bugs",
     "--microsoft_version",
     "1943",
-    "--pack_alignment",
-    "8",
     "-D_MSC_VER=1943",
     "-D_MSC_FULL_VER=194334604",
     "-D_MSC_BUILD=0",
diff --git a/Extension/package.json b/Extension/package.json
@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.24.2-main",
+    "version": "1.24.3-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",
diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -1165,8 +1165,9 @@ function handleMacCrashFileRead(err: NodeJS.ErrnoException | undefined | null, d
     logMacCrashTelemetry(data);
 }
 
-function containsUnexpectedTelemetryCharacter(str: string): boolean {
-    return str.includes("/") || str.includes("\\") || str.includes("@");
+function containsFilteredTelemetryData(str: string): boolean {
+    const regex: RegExp = /(key|token|sig|secret|signature|password|passwd|pwd|android:value)[^a-zA-Z0-9]/i;
+    return regex.test(str);
 }
 
 async function handleCrashFileRead(crashDirectory: string, crashFile: string, crashDate: Date, err: NodeJS.ErrnoException | undefined | null, data: string): Promise<void> {
@@ -1197,10 +1198,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
             if (pendingCrashLogLine === "ENDLOG") {
                 break;
             }
-            if (!containsUnexpectedTelemetryCharacter(pendingCrashLogLine)) {
-                crashLog += pendingCrashLogLine + "\n";
+            if (containsFilteredTelemetryData(pendingCrashLogLine)) {
+                crashLog += "?\n";
             } else {
-                crashLog += "<unexpectedCharacter>\n";
+                crashLog += pendingCrashLogLine + "\n";
             }
         }
         crashLog = crashLog.trimEnd();
@@ -1255,12 +1256,8 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
                 funcStr = funcStr.replace(/, std::allocator<std::string>/g, "");
             }
         }
-        if (funcStr.includes("/")) {
-            funcStr = "<funcForwardSlash>";
-        } else if (funcStr.includes("\\")) {
-            funcStr = "<funcBackSlash>";
-        } else if (funcStr.includes("@")) {
-            funcStr = "<funcAt>";
+        if (containsFilteredTelemetryData(funcStr)) {
+            funcStr = "?";
         } else if (!validFrameFound && (funcStr.startsWith("crash_handler(") || funcStr.startsWith("_sigtramp"))) {
             continue; // Skip these on early frames.
         }
@@ -1271,10 +1268,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
         const offsetPos2: number = offsetPos + offsetStr.length;
         if (isMac) {
             const pendingOffset: string = line.substring(offsetPos2);
-            if (!containsUnexpectedTelemetryCharacter(pendingOffset)) {
-                crashCallStack += pendingOffset;
+            if (containsFilteredTelemetryData(pendingOffset)) {
+                crashCallStack += "?";
             } else {
-                crashCallStack += "<offsetUnexpectedCharacter>";
+                crashCallStack += pendingOffset;
             }
             const startAddressPos: number = line.indexOf("0x");
             if (startAddressPos === -1 || startAddressPos >= startPos) {
@@ -1290,10 +1287,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
                 continue; // unexpected
             }
             const pendingOffset: string = line.substring(offsetPos2, endPos);
-            if (!containsUnexpectedTelemetryCharacter(pendingOffset)) {
-                crashCallStack += pendingOffset;
+            if (containsFilteredTelemetryData(pendingOffset)) {
+                crashCallStack += "?";
             } else {
-                crashCallStack += "<offsetUnexpectedCharacter>";
+                crashCallStack += pendingOffset;
             }
         }
     }
@@ -1312,8 +1309,8 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
         data = data.substring(0, 8191) + "…";
     }
 
-    if (containsUnexpectedTelemetryCharacter(addressData)) {
-        addressData = "<addressDataUnexpectedCharacter>";
+    if (containsFilteredTelemetryData(addressData)) {
+        addressData = "?";
     }
 
     logCppCrashTelemetry(data, addressData, crashLog);

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"defaults": [`
`3`	`3`	`"-D__building_module(x)=0",`
`4`		`- "--pack_alignment",`
`5`		`- "8",`
`6`	`4`	`"-Dunix=1",`
`7`	`5`	`"-D__unix__=1",`
`8`	`6`	`"-D__linux__=1",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"defaults": [`
`3`		`- "--pack_alignment",`
`4`		`- "8",`
`5`	`3`	`"-Dunix=1",`
`6`	`4`	`"-D__unix__=1",`
`7`	`5`	`"-D__linux__=1",`