Skip to content

Commit 4b67a68

Browse files
authored
Merge pull request #13960 from microsoft/seanmcm/mergeVs
Merge to vs
2 parents d321f0a + 5ded58b commit 4b67a68

File tree

65 files changed

+662
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+662
-231
lines changed

.github/actions/package-lock.json

Lines changed: 5 additions & 5 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@octokit/rest": "^21.1.1",
1616
"@slack/web-api": "^6.9.1",
1717
"applicationinsights": "^2.5.1",
18-
"axios": "^1.8.2",
18+
"axios": "^1.12.1",
1919
"uuid": "^8.3.2"
2020
},
2121
"devDependencies": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
The documentation for c_cpp_properties.json has moved to https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference.
1+
The documentation for c_cpp_properties.json has moved to https://code.visualstudio.com/docs/cpp/customize-cpp-settings.

Extension/CHANGELOG.md

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

3-
## Version 1.27.0: August 4, 2025
3+
## Version 1.27.7: September 18, 2025
4+
### Enhancements
5+
* Show a warning when too many files are processed in a workspace. [#10828](https://github.com/microsoft/vscode-cpptools/issues/10828)
6+
* Improvements to GitHub Copilot activation. [PR #13924](https://github.com/microsoft/vscode-cpptools/pull/13924)
7+
* Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer)
8+
* Add a `C_Cpp.windowsErrorReportingMode` setting and default to only enabling WER for the first crash in a session. [#13928](https://github.com/microsoft/vscode-cpptools/issues/13928)
9+
410
### Bug Fixes
11+
* Fix the `__FILE_NAME__` macro being undefined with IntelliSense when using GCC/Clang. [#11164](https://github.com/microsoft/vscode-cpptools/issues/11164)
512
* Fix an IntelliSense crash in `add_cached_tokens_to_string`. [#11900](https://github.com/microsoft/vscode-cpptools/issues/11900)
613
* Fix an IntelliSense crash in `find_subobject_for_interpreter_address`. [#12464](https://github.com/microsoft/vscode-cpptools/issues/12464)
14+
* Fix input delays when editing `c_cpp_properties.json`. [#13591](https://github.com/microsoft/vscode-cpptools/issues/13591)
715
* Fix changes to the active field being lost in the configuration UI when navigating away. [#13636](https://github.com/microsoft/vscode-cpptools/issues/13636)
816
* Fix compiler query failing on Windows if optional job-related API calls fail. [#13679](https://github.com/microsoft/vscode-cpptools/issues/13679)
917
* Fix bugs with Doxygen comments. [#13725](https://github.com/microsoft/vscode-cpptools/issues/13725), [#13726](https://github.com/microsoft/vscode-cpptools/issues/13726), [#13745](https://github.com/microsoft/vscode-cpptools/issues/13745)
@@ -15,7 +23,33 @@
1523
* Fix `-imacro` not configuring IntelliSense correctly. [#13785](https://github.com/microsoft/vscode-cpptools/issues/13785)
1624
* Fix `pipeTransport.quoteArgs` not being handled correctly. [#13791](https://github.com/microsoft/vscode-cpptools/issues/13791)
1725
* Thank you for the contribution. [@mrjist (Matt)](https://github.com/mrjist) [PR #13794](https://github.com/microsoft/vscode-cpptools/pull/13794)
26+
* Fix `.txx` and `.tpp` not being handled as C++ header files. [#13808](https://github.com/microsoft/vscode-cpptools/issues/13808)
27+
* Fix an error when using GitHub Copilot with VS Code older than 1.90.0. [#13818](https://github.com/microsoft/vscode-cpptools/issues/13818)
28+
* Fix activation failing if the `c_cpp_properties.json` exists but fails to be opened. [#13829](https://github.com/microsoft/vscode-cpptools/issues/13829)
29+
* Fix crash recovery. [#13838](https://github.com/microsoft/vscode-cpptools/issues/13838)
30+
* Fix Doxygen generation overwriting a function signature. [#13839](https://github.com/microsoft/vscode-cpptools/issues/13839)
31+
* Fix a crash on Windows 7, 8, and 10 (Server 2008, 2012, and 2016). [#13851](https://github.com/microsoft/vscode-cpptools/issues/13851)
32+
* Fix "CMake Tools" translations. [PR #13854](https://github.com/microsoft/vscode-cpptools/pull/13854)
33+
* Fix the language server getting stuck by a notification message box after a configuration provider times out. [#13862](https://github.com/microsoft/vscode-cpptools/issues/13862)
34+
* Fix a crash regression with `__BASE_FILE__`. [#13866](https://github.com/microsoft/vscode-cpptools/issues/13866)
35+
* Fix non-recursive browse paths from configuration providers. [#13886](https://github.com/microsoft/vscode-cpptools/issues/13886)
36+
* Fix an infinite recursion IntelliSense crash. [#13908](https://github.com/microsoft/vscode-cpptools/issues/13908)
37+
* Fix an IntelliSense crash during completion when using GCC ARM compilers. [#13925](https://github.com/microsoft/vscode-cpptools/issues/13925)
1838
* Fix an IntelliSense bug that could cause incorrect string lengths to be reported for string literals in files that use certain file encodings.
39+
* Fix an IntelliSense process crash involving `requires` expressions and templates.
40+
* Fix an IntelliSense process crash from deleting memory that is still in use.
41+
* Fix an IntelliSense process crash with `class_has_mutable_member`.
42+
* Fix a case of uninitialized memory in `cpptools-srv`.
43+
44+
## Version 1.26.5: September 10, 2025
45+
### Bug Fix
46+
* Fix extension activation getting stuck by GitHub Copilot activation. [#13914](https://github.com/microsoft/vscode-cpptools/issues/13914)
47+
* Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer) [PR #13918](https://github.com/microsoft/vscode-cpptools/pull/13918)
48+
49+
## Version 1.26.4: September 9, 2025
50+
### Enhancement
51+
* Update GitHub Copilot APIs. [PR #13877](https://github.com/microsoft/vscode-cpptools/pull/13877)
52+
* Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer)
1953

2054
## Version 1.26.3: June 24, 2025
2155
### New Feature
@@ -52,7 +86,7 @@
5286
### Bug Fixes
5387
* Fix no error appearing in the configuration UI when an invalid `compilerPath` is used. [#12661](https://github.com/microsoft/vscode-cpptools/issues/12661)
5488
* Fix the 'Debug C/C++ File' button sometimes disappearing. [#13400](https://github.com/microsoft/vscode-cpptools/issues/13400)
55-
* Fix a crash in `read_double`. [#13435](https://github.com/Microsoft/vscode-cpptools/issues/13435)
89+
* Fix a crash in `read_double`. [#13435](https://github.com/microsoft/vscode-cpptools/issues/13435)
5690
* Fix the handling of default file associations for certain file extensions. [PR #13455](https://github.com/microsoft/vscode-cpptools/pull/13455)
5791
* Fix shell parsing of the arguments of a full command line in `compilerPath`. [PR #13468](https://github.com/microsoft/vscode-cpptools/pull/13468)
5892
* Fix C and CUDA files being interpreted as C++ in `compile_commands.json`. [#13471](https://github.com/microsoft/vscode-cpptools/issues/13471)
@@ -98,7 +132,7 @@
98132
* Fix a potential deadlock after using 'Reset IntelliSense Database'. [#13337](https://github.com/microsoft/vscode-cpptools/issues/13337)
99133
* Fix some localization bugs. [PR #13373](https://github.com/microsoft/vscode-cpptools/pull/13373)
100134
* Fix IntelliSense showing the wrong size of objects. [#13375](https://github.com/microsoft/vscode-cpptools/issues/13375)
101-
* Fix the `get_mangled_function_name` IntelliSense process crash. [#13358](https://github.com/Microsoft/vscode-cpptools/issues/13358)
135+
* Fix the `get_mangled_function_name` IntelliSense process crash. [#13358](https://github.com/microsoft/vscode-cpptools/issues/13358)
102136
* Fix an issue with duplicate forced includes being removed. Multiple forced includes of the same file should now properly be included multiple times.
103137
* Fix an issue in which the base configuration browse paths may not get populated when using a custom configuration provider.
104138
* Fix an issue with forced includes not being resolved against the same include path search order as a compiler would.
@@ -157,7 +191,7 @@
157191
* Fix a compile commands fallback logic issue. [#12947](https://github.com/microsoft/vscode-cpptools/issues/12947)
158192
* Thank you for the contribution. [@yiftahw](https://github.com/yiftahw) [PR #12948](https://github.com/microsoft/vscode-cpptools/pull/12948)
159193
* Fix an issue in which a `didOpen` event was processed before the language client was fully started. [#12954](https://github.com/microsoft/vscode-cpptools/issues/12954)
160-
* Fix the IntelliSense mode being `macos` instead of `windows` when `_WIN32` is defined on macOS. [#13016](https://github.com/Microsoft/vscode-cpptools/issues/13016)
194+
* Fix the IntelliSense mode being `macos` instead of `windows` when `_WIN32` is defined on macOS. [#13016](https://github.com/microsoft/vscode-cpptools/issues/13016)
161195
* Fix IntelliSense bugs when using non-UTF8 file encodings. [#13028](https://github.com/microsoft/vscode-cpptools/issues/13028), [#13044](https://github.com/microsoft/vscode-cpptools/issues/13044)
162196
* Fix an incorrect translation for "binary operator". [#13048](https://github.com/microsoft/vscode-cpptools/issues/13048)
163197
* Fix the "references may be missing" logging pane being shown when the `C_Cpp.loggingLevel` is `Error` or `None`. [#13066](https://github.com/microsoft/vscode-cpptools/issues/13066)

Extension/ThirdPartyNotices.txt

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,29 @@ the licensed code:
10631063
DEALINGS IN THE SOFTWARE.
10641064

10651065

1066+
---------------------------------------------------------
1067+
1068+
---------------------------------------------------------
1069+
1070+
vscode-cpptools 7.1.1 - LicenseRef-scancode-generic-cla AND MIT
1071+
https://github.com/Microsoft/vscode-cpptools-api#readme
1072+
1073+
Copyright (c) Microsoft Corporation
1074+
1075+
vscode-cpptools-api
1076+
1077+
Copyright (c) Microsoft Corporation
1078+
All rights reserved.
1079+
1080+
MIT License
1081+
1082+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1083+
1084+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1085+
1086+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1087+
1088+
10661089
---------------------------------------------------------
10671090

10681091
---------------------------------------------------------
@@ -2658,7 +2681,7 @@ SOFTWARE.
26582681

26592682
---------------------------------------------------------
26602683

2661-
tmp 0.2.3 - MIT
2684+
tmp 0.2.4 - MIT
26622685
http://github.com/raszi/node-tmp
26632686

26642687
Copyright (c) 2014 KARASZI Istvan
@@ -2738,29 +2761,6 @@ The above copyright notice and this permission notice shall be included in all c
27382761

27392762
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27402763

2741-
---------------------------------------------------------
2742-
2743-
---------------------------------------------------------
2744-
2745-
vscode-cpptools 7.1.1 - MIT
2746-
https://github.com/Microsoft/vscode-cpptools-api#readme
2747-
2748-
Copyright (c) Microsoft Corporation
2749-
2750-
vscode-cpptools-api
2751-
2752-
Copyright (c) Microsoft Corporation
2753-
All rights reserved.
2754-
2755-
MIT License
2756-
2757-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2758-
2759-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
2760-
2761-
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2762-
2763-
27642764
---------------------------------------------------------
27652765

27662766
---------------------------------------------------------
@@ -2952,7 +2952,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
29522952
whatwg-url 5.0.0 - MIT
29532953
https://github.com/jsdom/whatwg-url#readme
29542954

2955-
(c) extraPathPercentEncodeSet.has
29562955
Copyright (c) 2015-2016 Sebastian Mayr
29572956

29582957
The MIT License (MIT)

Extension/i18n/chs/package.i18n.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@
255255
"c_cpp.configuration.vcpkg.enabled.markdownDescription": "为 [vcpkg 依存关系管理器](https://aka.ms/vcpkg/) 启用集成服务。",
256256
"c_cpp.configuration.addNodeAddonIncludePaths.markdownDescription": "当来自 `nan` 和 `node-addon-api` 的包含路径为依赖项时,请将其添加。",
257257
"c_cpp.configuration.copilotHover.markdownDescription": "如果为 `disabled`,则悬停时不会显示“生成 Copilot 摘要”选项。",
258+
"c_cpp.configuration.windowsErrorReportingMode.markdownDescription": "如果设置为 `disabled`,将禁用 Windows 错误报告。如果设置为 `default`,将启用 Windows 错误报告,但在当前会话中第一次崩溃后会被禁用。更改此设置不会影响当前正在运行的 IntelliSense 进程。",
258259
"c_cpp.configuration.renameRequiresIdentifier.markdownDescription": "如果为 `true`,则“重命名符号”将需要有效的 C/C++ 标识符。",
259260
"c_cpp.configuration.autocompleteAddParentheses.markdownDescription": "如果为 `true`,则自动完成将在函数调用后自动添加 `(` ,在这种情况下,也可以添加 `)` ,具体取决于 `#editor.autoClosingBrackets#` 设置的值。",
260261
"c_cpp.configuration.filesExclude.markdownDescription": "为排除文件夹(以及文件 - 如果更改了 `#C_Cpp.exclusionPolicy#`)配置 glob 模式。这些特定于 C/C++ 扩展,并且是 `#files.exclude#` 的补充,但与 `#files.exclude#` 不同,它们也适用于当前工作区文件夹之外的路径,并且不会从资源管理器视图中删除。详细了解 [glob 模式](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options)。",
@@ -310,7 +311,7 @@
310311
"c_cpp.debuggers.miDebuggerServerAddress.description": "要连接到的 MI 调试程序服务器的网络地址(示例: localhost:1234)。",
311312
"c_cpp.debuggers.useExtendedRemote.description": "使用目标扩展远程模式连接到 MI 调试器服务器。",
312313
"c_cpp.debuggers.stopAtEntry.markdownDescription": "可选参数。如果为 `true`,则调试程序应在目标的入口点处停止。如果传递了 `processId`,则不起任何作用。",
313-
"c_cpp.debuggers.debugServerPath.description": "到要启动的调试服务器的可选完整路径。默认值为 null。该路径与 miDebuggerServerAddress 或带有运行 -target-select remote <server:port>customSetupCommand 的自有服务器配合使用。",
314+
"c_cpp.debuggers.debugServerPath.description": "要启动的调试服务器的可选完整路径。默认值为 null。该路径与 \"miDebuggerServerAddress\" 或带有运行 \"-target-select remote <server:port>\"\"customSetupCommand\" 的自有服务器配合使用。",
314315
"c_cpp.debuggers.debugServerArgs.description": "可选调试服务器参数。默认为 null。",
315316
"c_cpp.debuggers.serverStarted.description": "要在调试服务器输出中查找的可选服务器启动模式。默认为 null。",
316317
"c_cpp.debuggers.filterStdout.description": "在 stdout 流中搜索服务器启动模式,并将 stdout 记录到默认输出。默认为 true。",

Extension/i18n/chs/src/LanguageServer/client.i18n.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
"config.not.found": "找不到请求的配置名称: {0}",
3131
"unsupported.client": "不支持的客户端",
3232
"timed.out": "将在 {0} 毫秒后超时。",
33+
"parsing.stats.large.project": "已枚举 {0} 个文件,检测到 {1} 个 C/C++ 源文件。你可能需要考虑排除某些文件以获得更好的性能。",
34+
"learn.more": "了解详细信息",
35+
"dont.show.again": "不再显示",
3336
"update.intellisense.time": "更新 IntelliSense 时间(秒): {0}",
3437
"configurations.received": "已收到自定义配置:",
3538
"browse.configuration.received": "已收到自定义浏览配置: {0}",

Extension/i18n/chs/src/LanguageServer/configurations.i18n.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Do not edit this file. It is machine generated.
66
{
77
"incompatible.intellisense.mode": "IntelliSense 模式 {0} 与编译器路径不兼容。",
8+
"resolve.configuration.processed": "已在 {0} 秒内中处理 c_cpp_properties.json",
89
"failed.to.create.config.folder": "未能创建“{0}”",
910
"invalid.configuration.file": "配置文件无效。数组中须至少存在一个配置。",
1011
"unknown.properties.version": "c_cpp_properties.json 中发现未知的版本号。某些功能可能无法按预期工作。",
@@ -13,9 +14,13 @@
1314
"path.with.spaces": "找不到带有空格的编译器路径。如果这是为了包含编译器参数,请用双引号({0})括住编译器路径。",
1415
"cannot.find": "无法找到: {0}",
1516
"path.is.not.a.file": "路径不是文件: {0}",
17+
"resolve.includePath.took.too.long": "包含路径验证计算耗时 {0} 秒",
18+
"resolve.includePath.failed": "未能解析包含路径。错误: {0}",
1619
"wrapped.with.quotes": "不要在路径周围添加额外的引号。",
1720
"path.is.not.a.directory": "路径不是目录: {0}",
1821
"duplicate.name": "{0} 重复。配置名称应是唯一的。",
22+
"resolve.path.took.too.long": "路径计算耗时 {0} 秒",
23+
"resolve.path.failed": "未能解析路径 {0}。错误: {1}",
1924
"multiple.paths.not.allowed": "不允许使用多个路径。",
2025
"multiple.paths.should.be.separate.entries": "多个路径应是数组中的单独条目。",
2126
"paths.are.not.directories": "路径不是目录: {0}"

0 commit comments

Comments
 (0)