Merge branch 'main' into seanmcm/switchHeaderSourceProgress

Author: sean-mcmanus

.github/actions/common/utils.ts

@@ -25,7 +25,6 @@ export const normalizeIssue = (issue: {
 	const cleanse = (str: string) => {
 		let out = str
 			.toLowerCase()
-			.replace(/<!--.*-->/gu, '')
 			.replace(/.* version: .*/gu, '')
 			.replace(/issue type: .*/gu, '')
 			.replace(/vs ?code/gu, '')
@@ -36,6 +35,12 @@ export const normalizeIssue = (issue: {
 			.replace(/\s+/gu, ' ')
 			.replace(/```[^`]*?```/gu, '');
 
+		while (
+			out.includes('<!--') &&
+			out.includes('-->') &&
+			out.indexOf('-->') > out.indexOf('<!--')) {
+			out = out.slice(0, out.indexOf('<!--')) + out.slice(out.indexOf('-->') + 3);
+		}
 		while (
 			out.includes(`<details>`) &&
 			out.includes('</details>') &&
@@ -116,9 +121,9 @@ Repo: ${context.repo.owner}/${context.repo.repo}
 
 <!-- Context:
 ${JSON.stringify(context, null, 2)
-	.replace(/<!--/gu, '<@--')
-	.replace(/-->/gu, '--@>')
-	.replace(/\/|\\/gu, 'slash-')}
+				.replace(/<!--/gu, '<@--')
+				.replace(/--!?\s*>/gu, '--@>')
+				.replace(/\/|\\/gu, 'slash-')}
 -->
 `);
 };

.github/actions/package-lock.json

@@ -15,8 +15,8 @@
     "@octokit/rest": "^21.1.1",
     "@slack/web-api": "^6.9.1",
     "applicationinsights": "^2.5.1",
-    "axios": "^1.15.0",
-    "uuid": "^8.3.2"
+    "axios": "^1.16.0",
+    "uuid": "^14.0.0"
   },
   "devDependencies": {
     "@azure/storage-blob": "^12.13.0",

.github/actions/package.json

@@ -5,6 +5,12 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
+    inputs:
+      target-ref:
+        description: Branch, tag, or SHA to test
+        required: true
+        default: main
 
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
@@ -15,3 +21,4 @@ jobs:
     with:
       runner-env: ubuntu-24.04
       platform: linux
+      checkout-ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target-ref || github.ref }}

.github/workflows/ci_linux.yml

@@ -5,6 +5,12 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
+    inputs:
+      target-ref:
+        description: Branch, tag, or SHA to test
+        required: true
+        default: main
 
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
@@ -15,4 +21,5 @@ jobs:
     with:
       runner-env: macos-15
       platform: mac
+      checkout-ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target-ref || github.ref }}
       yarn-args: --network-timeout 100000

.github/workflows/ci_mac.yml

@@ -5,6 +5,12 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
+    inputs:
+      target-ref:
+        description: Branch, tag, or SHA to test
+        required: true
+        default: main
 
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
@@ -15,3 +21,4 @@ jobs:
     with:
       runner-env: windows-2025
       platform: windows
+      checkout-ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target-ref || github.ref }}

.github/workflows/ci_windows.yml

@@ -11,6 +11,9 @@ on:
         # Expects 'mac', 'linux', or 'windows'
         required: true
         type: string
+      checkout-ref:
+        required: false
+        type: string
       yarn-args:
         type: string
 
@@ -23,6 +26,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.checkout-ref }}
 
       - name: Use Node.js 24
         uses: actions/setup-node@v4

.github/workflows/job-compile-and-test.yml

@@ -1,23 +1,30 @@
 # C/C++ for Visual Studio Code Changelog
 
-## Version 1.32.0: April 14, 2026
+## Version 1.32.2: April 28, 2026
 ### New Feature
-* Add support for run without debugging. [#1201](https://github.com/microsoft/vscode-cpptools/issues/1201)
+* Add support for "Run without debugging". [#1201](https://github.com/microsoft/vscode-cpptools/issues/1201)
 
 ### Enhancements
 * Add a `C_Cpp.doxygen.generateOnCodeAction` setting to allow disabling of Doxygen generation code actions. [#14341](https://github.com/microsoft/vscode-cpptools/issues/14341)
+* Add a `cpptools.waitForTagParsing` command (for use by the `C/C++ DevTools` extension). [PR #14407](https://github.com/microsoft/vscode-cpptools/pull/14407/changes)
 * Improve wildcard matching with the debugger natvis. [MIEngine#1162](https://github.com/microsoft/MIEngine/issues/1162)
 * Add support for `HideRawView` with the debugger natvis. [MIEngine#1458](https://github.com/microsoft/MIEngine/issues/1458)
 
 ### Bug Fixes
 * Fix high CPU usage caused by repeated calls to `selectChatModels`. [#14168](https://github.com/microsoft/vscode-cpptools/issues/14168), [#14211](https://github.com/microsoft/vscode-cpptools/issues/14211), [#14241](https://github.com/microsoft/vscode-cpptools/issues/14241)
 * Fix the MSVC developer environment not working if `UCRTVersion` isn't found, and update the walkthrough instructions for installing MSVC. [#14352](https://github.com/microsoft/vscode-cpptools/issues/14352)
+* Fix an IntelliSense crash when three special-case comments are used in a template. [#14360](https://github.com/microsoft/vscode-cpptools/issues/14360)
 * Fix Copilot hover taking too many premium requests. [#14372](https://github.com/microsoft/vscode-cpptools/issues/14372)
 * Fix null pointers being expandable for variables in the debugger. [MIEngine#698](https://github.com/microsoft/MIEngine/issues/698)
 * Fix recursive `{this}` evaluation with the debugger natvis. [MIEngine#1391](https://github.com/microsoft/MIEngine/issues/1391)
 * Update clang-tidy and clang-format from 22.1.1 to 22.1.3 (bug fixes).
 * Fix a bug with semantic colorization of operators.
 
+## Version 1.31.5: April 20, 2026
+### Bug Fixes
+* Fix `Reinstalling the Extension.md` not being found. [#14389](https://github.com/microsoft/vscode-cpptools/issues/14389)
+* Fix the `C/C++ DevTools` extension language service tools not working after the `C/C++` extension updates via `Restart Extensions`. [#14392](https://github.com/microsoft/vscode-cpptools/issues/14392)
+
 ## Version 1.31.4: March 31, 2026
 ### Bug Fix
 * Debugging cpptools and cpptools-srv processes on macOS (to get call stacks) is now blocked when SIP is enabled (due to a potential security issue).

Extension/CHANGELOG.md

@@ -213,17 +213,6 @@
                     "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.",