Skip to content

Commit 60846d4

Browse files
authored
Merge branch 'main' into seanmcm/bootstrapYarn
2 parents aa6b0e3 + 577a7b8 commit 60846d4

File tree

8 files changed

+49
-35
lines changed

8 files changed

+49
-35
lines changed

.github/actions/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"yargs": "^17.5.1"
4141
},
4242
"overrides": {
43-
"serialize-javascript": "^7.0.4"
43+
"serialize-javascript": "^7.0.4",
44+
"flatted": "^3.4.1"
4445
}
4546
}

Extension/CHANGELOG.md

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,22 @@
11
# C/C++ for Visual Studio Code Changelog
22

3-
## Version 1.31.2: March 17, 2026
4-
### Bug Fixes
5-
* Fix an incorrect warning message with `c_cpp_properties.json` squiggles. [PR #14265](https://github.com/microsoft/vscode-cpptools/pull/14265)
6-
* Fix cpptools getting stuck if C/C++ DevTools sends a workspace symbol request when the database is empty. [#14268](https://github.com/microsoft/vscode-cpptools/issues/14268)
7-
* Update clang-tidy and clang-format from 22.1.0 to 22.1.1 (bug fixes).
8-
9-
## Version 1.31.1: March 10, 2026
10-
### Enhancements
11-
* Update clang-tidy and clang-format from 21.1.4 to 22.1.0.
12-
* Update support for the latest compiler versions.
13-
14-
### Bug Fixes
15-
* Fix workspace symbol search with `scope::variable` not working after symbols are deleted and then added back. [#14200](https://github.com/microsoft/vscode-cpptools/issues/14200)
16-
* Fix bugs where a path was checked for existence but not whether it was a file or a folder. [#14257](https://github.com/microsoft/vscode-cpptools/issues/14257)
17-
* Add IntelliSense support for `__builtin_is_implicit_lifetime`.
18-
* Fix three IntelliSense process crashes.
19-
* Fix a bug with `-embed-directory`.
20-
* Add some missing translations.
21-
22-
## Version 1.31.0: February 19, 2026
23-
### Enhancements
3+
## Version 1.31.3: March 23, 2026
244
* Add support for `program` in attach debug configurations. [#14046](https://github.com/microsoft/vscode-cpptools/issues/14046)
255
* Thanks for the contribution. [@Subham-KRLX (Subham)](https://github.com/Subham-KRLX) [PR #14108](https://github.com/microsoft/vscode-cpptools/pull/14108)
6+
* Update clang-tidy and clang-format from 21.1.4 to 22.1.1.
7+
* Update support for the latest compiler versions.
268
* Update SQLite to the latest version.
279

2810
### Bug Fixes
2911
* Fix an IntelliSense error with deducing `this` (explicit object member functions) with conversion operators. [#14140](https://github.com/microsoft/vscode-cpptools/issues/14140)
3012
* Fix `embed-dir` compiler arguments not being handled for IntelliSense. [#14154](https://github.com/microsoft/vscode-cpptools/issues/14154)
13+
* Fix workspace symbol search with `scope::variable` not working after symbols are deleted and then added back. [#14200](https://github.com/microsoft/vscode-cpptools/issues/14200)
14+
* Fix bugs where a path was checked for existence but not whether it was a file or a folder. [#14257](https://github.com/microsoft/vscode-cpptools/issues/14257)
15+
* Add IntelliSense support for `__builtin_is_implicit_lifetime`.
16+
* Fix three IntelliSense process crashes.
17+
* Fix some missing translations.
3118

32-
## Version 1.30.5: February 9. 2026
19+
## Version 1.30.5: February 9, 2026
3320
### Bug Fix
3421
* Fix a potential language server deadlock after editing code.
3522

Extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "1.31.2-main",
5+
"version": "1.31.3-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",

ExtensionPack/package-lock.json

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExtensionPack/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@
4343
],
4444
"devDependencies": {
4545
"@vscode/vsce": "^3.7.1"
46+
},
47+
"overrides": {
48+
"@azure/msal-browser": "^4.29.1"
4649
}
4750
}

Themes/package-lock.json

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Themes/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,8 @@
6464
},
6565
"devDependencies": {
6666
"@vscode/vsce": "3.7.1"
67+
},
68+
"overrides": {
69+
"@azure/msal-browser": "^4.29.1"
6770
}
6871
}

0 commit comments

Comments
 (0)