Merge pull request #14643 from microsoft/main

Merge for 1.33.6 (2nd time)

.github/actions/package-lock.json

@@ -2872,9 +2872,9 @@
       "optional": true
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.16",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-1.1.16.tgz",
-      "integrity": "sha1-cj06MMBVjCJavJ/Eeac+FOJsPC8=",
+      "version": "1.1.18",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha1-POdNiYhRNr4VNTQfjD1EJcKaXKs=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3923,9 +3923,9 @@
       }
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.1.2.tgz",
-      "integrity": "sha1-C7oicf631Fiw0xrRNiWqpHVEMeI=",
+      "version": "2.1.4",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.1.4.tgz",
+      "integrity": "sha1-WJ2rEcABjQNmvmTNi/Esjb7MgyY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4181,9 +4181,9 @@
       "license": "ISC"
     },
     "node_modules/ip-address": {
-      "version": "10.2.0",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/ip-address/-/ip-address-10.2.0.tgz",
-      "integrity": "sha1-gF/BeLIMUYvUyFSLJP4wiS1/MgY=",
+      "version": "10.3.1",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/ip-address/-/ip-address-10.3.1.tgz",
+      "integrity": "sha1-kp+WKdFyT34bdIXOiXUvNnUzahA=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4551,9 +4551,9 @@
       }
     },
     "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.1.2.tgz",
-      "integrity": "sha1-C7oicf631Fiw0xrRNiWqpHVEMeI=",
+      "version": "2.1.4",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.1.4.tgz",
+      "integrity": "sha1-WJ2rEcABjQNmvmTNi/Esjb7MgyY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5463,9 +5463,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "6.27.0",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-6.27.0.tgz",
-      "integrity": "sha1-Qfnkj3xaQNJzdsqurYyan8e8qcQ=",
+      "version": "6.28.0",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-6.28.0.tgz",
+      "integrity": "sha1-nw44V0T+9QIdZZbFvM14P2EZPBw=",
       "license": "MIT",
       "engines": {
         "node": ">=18.17"

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    groups:
+      github-actions:
+        patterns: ["*"]
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 7

.github/workflows/bug-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Add Comment

.github/workflows/by-design-closer-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/by-design-closer.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/codeql.yml

@@ -59,11 +59,11 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -91,7 +91,7 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
       with:
         category: "/language:${{matrix.language}}"
 

.github/workflows/duplicate-closer.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/enhancement-closer-no-milestone.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/enhancement-closer-triage.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/enhancement-reopener.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Run Reopener

.github/workflows/external-closer-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/feature-request-closer-no-milestone.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/feature-request-closer-triage.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/feature-request-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Add Comment

.github/workflows/feature-request-reopener.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Run Reopener

.github/workflows/investigate-closer-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/investigate-costing-closer-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

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

@@ -25,12 +25,12 @@ jobs:
     runs-on: ${{ inputs.runner-env }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           ref: ${{ inputs.checkout-ref }}
 
       - name: Use Node.js 24
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version: 24
 
@@ -80,21 +80,21 @@ jobs:
 
       - name: Run languageServer integration tests (linux/macOS)
         if: ${{ inputs.platform == 'mac' || inputs.platform == 'linux' }}
-        uses: coactions/setup-xvfb@v1
+        uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
         with:
           run: yarn test --scenario=SingleRootProject
           working-directory: Extension
 
       - name: Run E2E IntelliSense features tests (linux/macOS)
         if: ${{ inputs.platform == 'mac' || inputs.platform == 'linux' }}
-        uses: coactions/setup-xvfb@v1
+        uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
         with:
           run: yarn test --scenario=MultirootDeadlockTest
           working-directory: Extension
 
       - name: Run RunWithoutDebugging tests (linux/macOS)
         if: ${{ inputs.platform == 'mac' || inputs.platform == 'linux' }}
-        uses: coactions/setup-xvfb@v1
+        uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
         with:
           run: yarn test --scenario=RunWithoutDebugging --scenario-arg=skipExternalConsole
           working-directory: Extension

.github/workflows/locker.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Run Locker

.github/workflows/more-info-needed-closer-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/more-info-needed-closer.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/question-closer-debugger.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

.github/workflows/question-closer.yml

@@ -18,7 +18,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Actions
         run: cd ./.github/actions && npm install --production && cd ../..
       - name: Stale Closer

Documentation/Building the Extension.md

@@ -5,7 +5,7 @@ These steps will allow you to debug the TypeScript code that is part of the Micr
 Prerequisite steps:
   * Clone the release branch of [this](https://github.com/Microsoft/vscode-cpptools) repository.
       * git clone -b release https://github.com/Microsoft/vscode-cpptools
-  * Install [node](https://nodejs.org).
+  * Install the [required Node.js version](../Extension/readme.developer.md#required-tools).
   * Install [yarn](https://yarnpkg.com).
   * From a command line, run the following commands from the **Extension** folder in the root of the repository:
       * `yarn install` will install the dependencies needed to build the extension.

Extension/.gitignore

@@ -10,6 +10,7 @@ server
 debugAdapters
 LLVM
 bin/assert_dialog.sh
+bin/binaryVersion.json
 bin/cpptools*
 bin/edge_cli
 bin/isense_driver

Extension/.scripts/copyExtensionBinaries.ts

@@ -7,7 +7,7 @@ import { cp, readdir, rm, stat } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, join } from 'node:path';
 import { verbose } from '../src/Utility/Text/streams';
-import { $args, $root, green, heading, note } from './common';
+import { $args, $root, Git, green, heading, note, warn } from './common';
 
 const extensionPrefix = 'ms-vscode.cpptools-';
 const foldersToCopy = ['bin', 'debugAdapters', 'LLVM'] as const;
@@ -125,6 +125,33 @@ async function findLatestInstalledExtension(providedPath?: string): Promise<stri
     return installed[0].path;
 }
 
+/**
+ * A few files inside the copied folders are checked into the repo (for example bin/cpp.hint and
+ * bin/messages/**). The copy overwrites them with the installed extension's versions, which can differ
+ * in line endings or content and then show up as spurious local modifications. Restore any tracked files
+ * that the copy changed so only the untracked binaries remain in the working tree.
+ */
+async function restoreTrackedFiles(): Promise<void> {
+    const modified = await Git('ls-files', '--modified', '--', ...foldersToCopy);
+    if (modified.code) {
+        warn(`Unable to determine which tracked files to restore: ${modified.error.all().join('\n')}`);
+        return;
+    }
+
+    const files = modified.stdio.all().map(line => line.trim()).filter(line => line.length > 0);
+    if (!files.length) {
+        return;
+    }
+
+    const restored = await Git('checkout', '--', ...files);
+    if (restored.code) {
+        warn(`Unable to restore tracked files after copy: ${restored.error.all().join('\n')}`);
+        return;
+    }
+
+    note(`Restored ${files.length} tracked ${files.length === 1 ? 'file' : 'files'} overwritten by the copy.`);
+}
+
 export async function main(sourcePath = $args[0]): Promise<string | undefined> {
     console.log(heading('Copy installed extension binaries'));
 
@@ -142,6 +169,8 @@ export async function main(sourcePath = $args[0]): Promise<string | undefined> {
 
     note(`Copied installed binaries into ${$root}`);
 
+    await restoreTrackedFiles();
+
     const installedVersion = tryParseVersion(basename(installedExtensionPath));
     return installedVersion?.join('.');
 }

Extension/.scripts/installAndCopyBinaries.ts

@@ -6,7 +6,7 @@
 import { runVSCodeCommand } from '@vscode/test-electron';
 import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { $root, error, heading, note } from './common';
+import { $root, error, heading, note, warn } from './common';
 import * as copy from './copyExtensionBinaries';
 import { install, isolated, options } from "./vscode";
 
@@ -24,7 +24,9 @@ export async function main() {
         console.log(result.stdout.toString());
     }
     if (result.stderr) {
-        error(result.stderr.toString());
+        // runVSCodeCommand resolves only when the command succeeds (it throws on a non-zero exit), so stderr here is
+        // non-fatal output such as Node deprecation warnings and must not be reported as an error.
+        warn(result.stderr.toString());
     }
 
     const binaryVersion = await copy.main(isolated);

Extension/.scripts/test.ts

@@ -27,6 +27,7 @@ const filters = [
     /^Unexpected token A/,
     /Cannot register 'cmake.cmakePath'/,
     /\[DEP0005\] DeprecationWarning/,
+    /\[DEP0169\] DeprecationWarning/,
     /--trace-deprecation/,
     /Iconv-lite warning/,
     /^Extension '/,

Extension/.scripts/vscode.ts

@@ -15,7 +15,12 @@ export const extensionsDir = resolve(isolated, 'extensions');
 export const userDir = resolve(isolated, 'user-data');
 export const settings = resolve(userDir, "User", 'settings.json');
 
+// Pin the test VS Code build to a known-good stable release for deterministic CI instead of
+// always pulling latest. Launching macOS 1.110+ builds requires @vscode/test-electron >= 3.1.0.
+export const testVSCodeVersion = '1.131.0';
+
 export const options = {
+    version: testVSCodeVersion,
     cachePath: `${isolated}/cache`,
     launchArgs: ['--no-sandbox', '--disable-updates', '--skip-welcome', '--skip-release-notes', '--disable-extensions', `--extensions-dir=${extensionsDir}`, `--user-data-dir=${userDir}`, '--disable-workspace-trust']
 };

Extension/CHANGELOG.md

@@ -1,5 +1,18 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.33.6: August 4, 2026
+### Bug Fixes
+* Fix a spurious recursive includes (`**`) debug console log warning for paths merged from `c_cpp_properties.json` when `C_Cpp.mergeConfigurations` is enabled. [#14125](https://github.com/microsoft/vscode-cpptools/issues/14125)
+  * Thanks for the contribution. [@owevertonguedes (Weverton Guedes)](https://github.com/owevertonguedes) [PR #14620](https://github.com/microsoft/vscode-cpptools/pull/14620)
+* Fix custom configurations being discarded when `C_Cpp.mergeConfigurations` is enabled and a provider supplies the file `uri` as a `vscode.Uri`. [#14621](https://github.com/microsoft/vscode-cpptools/issues/14621)
+  * Thanks for the contribution. [@owevertonguedes (Weverton Guedes)](https://github.com/owevertonguedes) [PR #14624](https://github.com/microsoft/vscode-cpptools/pull/14624)
+* Fix a tag parser crash when a UTF-8 string literal is concatenated with a narrow string literal containing an invalid multibyte sequence.
+* Fix potential browse database corruption when the same workspace is opened by multiple processes on Linux and macOS.
+* Fix a crash when reading files saved in certain multibyte encodings such as GB18030 or EUC-JP.
+* Fix an incorrect file path in an error message on Windows.
+* Other potential crash fixes.
+* Update dependencies.
+
 ## Version 1.33.5: July 28, 2026
 ### Bug Fixes
 * Fix the remote process picker `ps` command not working with some shells. [#14442](https://github.com/microsoft/vscode-cpptools/issues/14442)

Extension/ThirdPartyNotices.txt

@@ -1487,7 +1487,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-brace-expansion 1.1.16 - MIT
+brace-expansion 1.1.18 - MIT
 https://github.com/juliangruber/brace-expansion
 
 Copyright (c) 2013 Julian Gruber <[email protected]>
@@ -1519,7 +1519,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-brace-expansion 2.1.2 - MIT
+brace-expansion 2.1.4 - MIT
 https://github.com/juliangruber/brace-expansion
 
 Copyright (c) 2013 Julian Gruber <[email protected]>

Extension/bin/messages/cs/messages.json

@@ -3747,5 +3747,6 @@
     "„static“ je zde nestandardní",
     "%nd byl dříve deklarován bez explicitního základu výčtu",
     "Chybějící typename je tady nestandardní.",
-    "Zkrácená syntaxe šablony funkce není standardní pro vodítka dedukce"
+    "Zkrácená syntaxe šablony funkce není standardní pro vodítka dedukce",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/de/messages.json

@@ -3747,5 +3747,6 @@
     "„static“ entspricht hier nicht dem Standard",
     "%nd wurde zuvor ohne explizite Enumerationsbasis deklariert",
     "Fehlender „typename“ entspricht hier nicht dem Standard.",
-    "Die abgekürzte Funktionsvorlagensyntax entspricht nicht dem Standard für Deduktionsleitfäden."
+    "Die abgekürzte Funktionsvorlagensyntax entspricht nicht dem Standard für Deduktionsleitfäden.",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/es/messages.json

@@ -3747,5 +3747,6 @@
     "\"static\" no es estándar aquí",
     "%nd se declaró previamente sin una base explícita de enumeración",
     "falta 'typename' no estándar aquí",
-    "La sintaxis abreviada de las plantillas de funciones no es estándar para las guías de deducción"
+    "La sintaxis abreviada de las plantillas de funciones no es estándar para las guías de deducción",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/fr/messages.json

@@ -3747,5 +3747,6 @@
     "« static » n’est pas standard ici",
     "%nd a été déclaré précédemment sans base d’énumération explicite",
     "le mot-clé « typename » manquant n’est pas standard ici",
-    "la syntaxe abrégée du modèle de fonction n’est pas standard pour les guides de déduction"
+    "la syntaxe abrégée du modèle de fonction n’est pas standard pour les guides de déduction",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/it/messages.json

@@ -3747,5 +3747,6 @@
     "'static' non è standard qui",
     "%nd era stato dichiarato in precedenza senza una base di enumerazione esplicita",
     "manca 'typename' che qui non è standard",
-    "la sintassi abbreviata del modello di funzione non è standard per le guide alla deduzione"
+    "la sintassi abbreviata del modello di funzione non è standard per le guide alla deduzione",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/ja/messages.json

@@ -3747,5 +3747,6 @@
     "'static' はここでは非標準です",
     "%nd は、明示的な列挙型ベースなしで以前に宣言されました",
     "見つからない 'typename' はここでは非標準です",
-    "省略形の関数テンプレート構文は、推論ガイドでは非標準です"
+    "省略形の関数テンプレート構文は、推論ガイドでは非標準です",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/ko/messages.json

@@ -3747,5 +3747,6 @@
     "여기서 'static'은 표준이 아닙니다.",
     "%nd은(는) 이전에 명시적 열거형 기반 없이 선언되었습니다.",
     "여기서 누락된 'typename'이 표준이 아닙니다.",
-    "약식 함수 템플릿 구문은 추론 가이드에 대한 표준이 아닙니다."
+    "약식 함수 템플릿 구문은 추론 가이드에 대한 표준이 아닙니다.",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/pl/messages.json

@@ -3747,5 +3747,6 @@
     "„static” jest tutaj niestandardowy",
     "funkcja %nd została poprzednio zadeklarowana bez jawnej bazy wyliczenia",
     "brak elementu „typename” jest tutaj niestandardowe",
-    "skrócona składnia szablonu funkcji jest niestandardowa dla przewodników dedukcji"
+    "skrócona składnia szablonu funkcji jest niestandardowa dla przewodników dedukcji",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/pt-br/messages.json

@@ -3747,5 +3747,6 @@
     "\"static\" não é padrão aqui",
     "%nd foi declarado anteriormente sem uma base de enumeração explícita",
     "\"typename\" ausente não é padrão aqui",
-    "a sintaxe abreviada de template de função é não padrão para guias de dedução"
+    "a sintaxe abreviada de template de função é não padrão para guias de dedução",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/ru/messages.json

@@ -3747,5 +3747,6 @@
     "\"static\" является здесь нестандартным",
     "%nd ранее был объявлен без явной базы перечисления",
     "отсутствие typename здесь является нестандартным",
-    "сокращенный синтаксис шаблона функции не является стандартным для правил дедукции"
+    "сокращенный синтаксис шаблона функции не является стандартным для правил дедукции",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/tr/messages.json

@@ -3747,5 +3747,6 @@
     "'static' burada standart dışıdır",
     "%nd daha önce açık bir sabit liste tabanı olmadan tanımlanmıştı",
     "eksik 'typename' burada standart dışı",
-    "kısaltılmış işlev şablonu sözdizimi çıkarsama kılavuzları için standart değil"
+    "kısaltılmış işlev şablonu sözdizimi çıkarsama kılavuzları için standart değil",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/zh-cn/messages.json

@@ -3747,5 +3747,6 @@
     "此处使用 \"static\" 不符合标准",
     "之前声明 %nd 时未指定显式枚举基类型",
     "此处缺少 'typename' 属于非标准用法",
-    "缩写函数模板语法对于推导指南是不标准的"
+    "缩写函数模板语法对于推导指南是不标准的",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/bin/messages/zh-tw/messages.json

@@ -3747,5 +3747,6 @@
     "此處使用的 'static' 非標準",
     "%nd 先前宣告時未明確指定的列舉基底",
     "此處缺少 'typename' 非標準用法",
-    "簡化函式範本語法在推導指南中並非標準用法"
+    "簡化函式範本語法在推導指南中並非標準用法",
+    "too many nested user-defined conversions (possible cycle of converting routines)"
 ]

Extension/package.json

@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.33.5-main",
+    "version": "1.33.6-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",
@@ -7203,7 +7203,7 @@
         "@vscode/debugadapter": "^1.65.0",
         "@vscode/debugprotocol": "^1.65.0",
         "@vscode/dts": "^0.4.0",
-        "@vscode/test-electron": "^2.3.10",
+        "@vscode/test-electron": "^3.1.0",
         "@vscode/vsce": "^3.9.2",
         "async-child-process": "^1.1.1",
         "await-notify": "^1.0.1",
@@ -7258,13 +7258,13 @@
         "which": "^2.0.2"
     },
     "resolutions": {
-        "postcss": "^8.5.18",
+        "postcss": "^8.5.23",
         "gulp-typescript/**/glob-parent": "^5.1.2",
         "serialize-javascript": "^7.0.5",
         "@azure/msal-browser": "^4.29.1",
         "flatted": "^3.4.1",
         "uuid": "^11.1.1",
-        "undici": "^7.28.0",
+        "undici": "^7.29.0",
         "fast-uri": "^3.1.4"
     }
 }

Extension/readme.developer.md

@@ -35,7 +35,7 @@
 
 ### Required Tools 
 
-* [Node.js](https://nodejs.org/en/download/) v16.*
+* [Node.js](https://nodejs.org/en/download/) 24.x
 * npm (comes with Node.js)
 
 ### Setting up the repository

Extension/src/LanguageServer/client.ts

@@ -1767,8 +1767,8 @@ export class DefaultClient implements Client {
             errorHandler: {
                 error: (error, message, count) => {
                     telemetry.logLanguageServerEvent("languageClientError", {
-                        error: error.toString(),
-                        message: message?.toString() ?? '',
+                        clientError: error.toString(),
+                        clientMessage: message?.toString() ?? '',
                         count: count?.toString() ?? ''
                     });
                     return { action: ErrorAction.Continue };
@@ -2328,7 +2328,35 @@ export class DefaultClient implements Client {
             if (configs && configs.length > 0 && configs[0]) {
                 const fileConfiguration: configs.Configuration | undefined = this.configuration.CurrentConfiguration;
                 if (fileConfiguration?.mergeConfigurations) {
+                    // deepCopy is a JSON round trip, which a vscode.Uri does not survive. The copy is
+                    // a plain object that is neither a string nor a Uri, so sendCustomConfigurations
+                    // discards the item. The uri field also accepts a string, so normalize it into a
+                    // new item before copying, without assigning into what the provider returned or
+                    // calling a method on its array.
+                    if (configs instanceof Array) {
+                        const normalized: util.Mutable<SourceFileConfigurationItem>[] = [];
+                        const count: number = configs.length;
+                        for (let i: number = 0; i < count; ++i) {
+                            const config: util.Mutable<SourceFileConfigurationItem> = configs[i];
+                            const uri = config?.uri;
+                            normalized.push(util.isUri(uri) ? { uri: uri.toString(), configuration: config.configuration } : config);
+                        }
+                        configs = normalized;
+                    }
                     configs = deepCopy(configs);
+                }
+                // Only the include paths from the provider are checked for recursive includes, so
+                // this has to happen before the include paths from c_cpp_properties.json are
+                // appended below, where a trailing '**' is a supported way to recurse.
+                if (configs instanceof Array) {
+                    configs.forEach(config => {
+                        if (util.isArrayOfString(config?.configuration?.includePath) &&
+                            config.configuration.includePath.some(path => path.endsWith('**'))) {
+                            console.warn("custom include paths should not use recursive includes ('**')");
+                        }
+                    });
+                }
+                if (fileConfiguration?.mergeConfigurations) {
                     configs.forEach(config => {
                         if (fileConfiguration.includePath) {
                             fileConfiguration.includePath.forEach(p => {
@@ -3457,9 +3485,6 @@ export class DefaultClient implements Client {
                 this.configurationLogging.set(uri, JSON.stringify(item.configuration, null, 4));
                 out.appendLineAtLevel(6, `  uri: ${uri}`);
                 out.appendLineAtLevel(6, `  config: ${JSON.stringify(item.configuration, null, 2)}`);
-                if (item.configuration.includePath.some(path => path.endsWith('**'))) {
-                    console.warn("custom include paths should not use recursive includes ('**')");
-                }
                 // Separate compiler path and args before sending to language client
                 const itemConfig: util.Mutable<InternalSourceFileConfiguration> = deepCopy(item.configuration);
                 if (util.isString(itemConfig.compilerPath)) {

Extension/src/LanguageServer/extension.ts

@@ -38,7 +38,7 @@ import { CppConfigurationLanguageModelTool } from './lmTool';
 import { getLocaleId } from './localization';
 import { PersistentState } from './persistentState';
 import { NodeType, TreeNode } from './referencesModel';
-import { CppSettings } from './settings';
+import { CppSettings, trackedSections } from './settings';
 import { LanguageStatusUI, getUI } from './ui';
 import { makeLspRange, rangeEquals, showInstallCompilerWalkthrough } from './utils';
 
@@ -293,7 +293,9 @@ export function updateLanguageConfigurations(): void {
 async function onDidChangeSettings(event: vscode.ConfigurationChangeEvent): Promise<void> {
     clients.forEach(client => {
         if (client instanceof DefaultClient) {
-            void client.onDidChangeSettings(event).catch(logAndReturn.undefined);
+            if (trackedSections.some(section => event.affectsConfiguration(section, client.RootUri))) {
+                void client.onDidChangeSettings(event).catch(logAndReturn.undefined);
+            }
         }
     });
 }

Extension/src/LanguageServer/settings.ts

@@ -32,6 +32,10 @@ export interface Associations {
     [key: string]: string;
 }
 
+// The settings sections that we provide accessors for.
+// This is used to filter out settings changed events that do not impact the extension.
+export const trackedSections: string[] = ['C_Cpp', 'editor', 'files', 'search', 'workbench'];
+
 // Settings that can be undefined have default values assigned in the native code or are meant to return undefined.
 export interface WorkspaceFolderSettingsParams {
     uri: string | undefined;

Extension/src/nativeStrings.json

@@ -747,5 +747,13 @@
     "check_timed_out": {
         "text": "timed out waiting for analysis of {0} to finish",
         "hint": "{0} is the source file path. {Locked=\"{0}\"}"
+    },
+    "failed_to_open_browse_db_lock_file": {
+        "text": "Failed to open browse database lock file: {0} (errno={1})",
+        "hint": "{0} is the lock file path. {1} is the errno value. {Locked=\"{0}\"} {Locked=\"errno\"} {Locked=\"{1}\"}"
+    },
+    "failed_to_lock_browse_db_lock_file": {
+        "text": "Failed to lock browse database lock file: {0} (errno={1})",
+        "hint": "{0} is the lock file path. {1} is the errno value. {Locked=\"{0}\"} {Locked=\"errno\"} {Locked=\"{1}\"}"
     }
 }

Extension/yarn.lock

@@ -1055,10 +1055,10 @@
     "@microsoft/1ds-post-js" "^4.3.4"
     "@microsoft/applicationinsights-web-basic" "^3.3.4"
 
-"@vscode/test-electron@^2.3.10":
-  version "2.5.2"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@vscode/test-electron/-/test-electron-2.5.2.tgz#f7d4078e8230ce9c94322f2a29cc16c17954085d"
-  integrity sha1-99QHjoIwzpyUMi8qKcwWwXlUCF0=
+"@vscode/test-electron@^3.1.0":
+  version "3.1.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@vscode/test-electron/-/test-electron-3.1.0.tgz#46b93d118dcd3b3c89caae296a13f9a7f5eb63c5"
+  integrity sha1-Rrk9EY3NOzyJyq4pahP5p/XrY8U=
   dependencies:
     http-proxy-agent "^7.0.2"
     https-proxy-agent "^7.0.5"
@@ -1737,27 +1737,27 @@ boundary@^2.0.0:
   integrity sha1-FpyLHw1Ezywlk4lnoyjzfgpOXvw=
 
 brace-expansion@^1.1.7:
-  version "1.1.16"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-1.1.16.tgz#723d3a30c0558c225abc9fc479a73e14e26c3c2f"
-  integrity sha1-cj06MMBVjCJavJ/Eeac+FOJsPC8=
+  version "1.1.18"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-1.1.18.tgz#3ce74d89885136be1535341f8c3d4425c29a5cab"
+  integrity sha1-POdNiYhRNr4VNTQfjD1EJcKaXKs=
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^5.0.2:
-  version "5.0.8"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.8.tgz#135ad0d8d808eb18eb5e0ec9a21f3a0b92ef18cf"
-  integrity sha1-E1rQ2NgI6xjrXg7Joh86C5LvGM8=
-  dependencies:
-    balanced-match "^4.0.2"
-
 brace-expansion@^2.0.1:
-  version "2.1.2"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.1.2.tgz#0bba2271feb7d458b0d31ad13625aaa4754431e2"
-  integrity sha1-C7oicf631Fiw0xrRNiWqpHVEMeI=
+  version "2.1.4"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.1.4.tgz#589dab11c0018d0366be64cd8bf12c8dbecc8326"
+  integrity sha1-WJ2rEcABjQNmvmTNi/Esjb7MgyY=
   dependencies:
     balanced-match "^1.0.0"
 
+brace-expansion@^5.0.2:
+  version "5.0.9"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.9.tgz#7c72438809b5fa5babf54199a1f1c281a6984fcf"
+  integrity sha1-fHJDiAm1+lur9UGZofHCgaaYT88=
+  dependencies:
+    balanced-match "^4.0.2"
+
 braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
@@ -4996,10 +4996,10 @@ possible-typed-array-names@^1.0.0:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
   integrity sha1-k+NYK8DlQmWG2dB7ee5A/IQd5K4=
 
-postcss@^7.0.16, postcss@^8.5.18:
-  version "8.5.22"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/postcss/-/postcss-8.5.22.tgz#086a0d5685a715acf5950ebbcb1538faf3051697"
-  integrity sha1-CGoNVoWnFaz1lQ67yxU4+vMFFpc=
+postcss@^7.0.16, postcss@^8.5.23:
+  version "8.5.25"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/postcss/-/postcss-8.5.25.tgz#5012a598eaaa897f21bbe8553be3cb7bd2bd78cb"
+  integrity sha1-UBKlmOqqiX8hu+hVO+PLe9K9eMs=
   dependencies:
     nanoid "^3.3.16"
     picocolors "^1.1.1"
@@ -6241,10 +6241,10 @@ undici-types@~7.18.0:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici-types/-/undici-types-7.18.2.tgz#29357a89e7b7ca4aef3bf0fd3fd0cd73884229e9"
   integrity sha1-KTV6iee3ykrvO/D9P9DNc4hCKek=
 
-undici@^7.19.0, undici@^7.28.0:
-  version "7.28.0"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.28.0.tgz#97d64564198b285bc281f0e8e29597e3d11fe7ec"
-  integrity sha1-l9ZFZBmLKFvCgfDo4pWX49Ef5+w=
+undici@^7.19.0, undici@^7.29.0:
+  version "7.29.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.29.0.tgz#ae0f6f62e06e057a9cbb7b2b5fde2bb74f791b8f"
+  integrity sha1-rg9vYuBuBXqcu3srX94rt095G48=
 
 unicorn-magic@^0.1.0:
   version "0.1.0"

ExtensionPack/package-lock.json

@@ -948,16 +948,16 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/brace-expansion": {
-            "version": "5.0.8",
-            "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.8.tgz",
-            "integrity": "sha1-E1rQ2NgI6xjrXg7Joh86C5LvGM8=",
+            "version": "5.0.9",
+            "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.9.tgz",
+            "integrity": "sha1-fHJDiAm1+lur9UGZofHCgaaYT88=",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^4.0.2"
             },
             "engines": {
-                "node": "18 || 20 || >=22"
+                "node": "20 || >=22"
             }
         },
         "node_modules/braces": {
@@ -3642,9 +3642,9 @@
             "license": "MIT"
         },
         "node_modules/undici": {
-            "version": "7.28.0",
-            "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.28.0.tgz",
-            "integrity": "sha1-l9ZFZBmLKFvCgfDo4pWX49Ef5+w=",
+            "version": "7.29.0",
+            "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.29.0.tgz",
+            "integrity": "sha1-rg9vYuBuBXqcu3srX94rt095G48=",
             "dev": true,
             "license": "MIT",
             "engines": {

Themes/.vscodeignore

@@ -1,5 +1,7 @@
 # ignore vscode settings for extension development
 .vscode/**
 
-# ignore package lock
-package-lock.json
+# ignore development files
+.gitignore
+.npmrc
+package-lock.json

Themes/package-lock.json

@@ -948,16 +948,16 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.8",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.8.tgz",
-      "integrity": "sha1-E1rQ2NgI6xjrXg7Joh86C5LvGM8=",
+      "version": "5.0.9",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.9.tgz",
+      "integrity": "sha1-fHJDiAm1+lur9UGZofHCgaaYT88=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/braces": {
@@ -3642,9 +3642,9 @@
       "license": "MIT"
     },
     "node_modules/undici": {
-      "version": "7.28.0",
-      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.28.0.tgz",
-      "integrity": "sha1-l9ZFZBmLKFvCgfDo4pWX49Ef5+w=",
+      "version": "7.29.0",
+      "resolved": "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.29.0.tgz",
+      "integrity": "sha1-rg9vYuBuBXqcu3srX94rt095G48=",
       "dev": true,
       "license": "MIT",
       "engines": {