Skip to content

Commit 97c5f14

Browse files
authored
Merge pull request #13563 from microsoft/main
Merge for 1.25.3
2 parents c4003c0 + ff55c59 commit 97c5f14

File tree

84 files changed

+466
-232
lines changed

Some content is hidden

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

84 files changed

+466
-232
lines changed

.github/actions/AddComment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ inputs:
3838
readonly:
3939
description: If true, changes are not applied.
4040
runs:
41-
using: 'node12'
41+
using: 'node20'
4242
main: 'index.js'

.github/actions/Locker/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ inputs:
2929
readonly:
3030
description: If true, changes are not applied.
3131
runs:
32-
using: 'node12'
32+
using: 'node20'
3333
main: 'index.js'

.github/actions/Reopener/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ inputs:
3333
readonly:
3434
description: If true, changes are not applied.
3535
runs:
36-
using: 'node12'
36+
using: 'node20'
3737
main: 'index.js'

.github/actions/StaleCloser/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ inputs:
4343
readonly:
4444
description: If true, changes are not applied.
4545
runs:
46-
using: 'node12'
46+
using: 'node20'
4747
main: 'index.js'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v4
2323

24-
- name: Use Node.js 20
24+
- name: Use Node.js 22
2525
uses: actions/setup-node@v4
2626
with:
27-
node-version: 20
27+
node-version: 22
2828

2929
- name: Install Dependencies
3030
run: yarn install ${{ inputs.yarn-args }}

Build/cg/cg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ extends:
8080
displayName: Use Yarn 1.x
8181

8282
- task: UseNode@1
83-
displayName: Use Node 18.x
83+
displayName: Use Node 22.x
8484
inputs:
85-
version: 18.x
85+
version: 22.x
8686

8787
- script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc
8888
displayName: Delete .npmrc if it exists

Build/loc/TranslationsImportExport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extends:
5050
steps:
5151
- task: NodeTool@0
5252
inputs:
53-
versionSpec: '18.x'
53+
versionSpec: '22.x'
5454
displayName: 'Install Node.js'
5555

5656
- task: CmdLine@2

Build/package/jobs_package_vsix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- checkout: self
2323

2424
- task: UseNode@1
25-
displayName: Use Node 18.x
25+
displayName: Use Node 22.x
2626
inputs:
27-
version: 18.x
27+
version: 22.x
2828

2929
- task: Npm@0
3030
displayName: Install vsce

Build/publish/jobs_publish_vsix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717

1818
steps:
1919
- task: NodeTool@0
20-
displayName: Use Node 18.x
20+
displayName: Use Node 22.x
2121
inputs:
22-
versionSpec: 18.x
22+
versionSpec: 22.x
2323

2424
- task: Npm@0
2525
displayName: Install vsce

Extension/.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"editor.formatOnSave": true,
2828
"editor.defaultFormatter": "vscode.json-language-features",
2929
"editor.tabSize": 4,
30-
"files.insertFinalNewline": true
30+
"files.insertFinalNewline": false
3131
},
3232
"[jsonc]": {
3333
"editor.formatOnSave": true,

Extension/CHANGELOG.md

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

3+
## Version 1.25.3: April 28, 2025
4+
### Enhancement
5+
* Add a configuration warning message explaining why paths in quotes can't be found. [#11955](https://github.com/microsoft/vscode-cpptools/issues/11955)
6+
* Improve the description of the `C_Cpp.copilotHover` setting. [PR #13461](https://github.com/microsoft/vscode-cpptools/pull/13461)
7+
8+
### Bug Fixes
9+
* Fix no error appearing in the configuration UI when an invalid `compilerPath` is used. [#12661](https://github.com/microsoft/vscode-cpptools/issues/12661)
10+
* Fix the 'Debug C/C++ File' button sometimes disappearing. [#13400](https://github.com/microsoft/vscode-cpptools/issues/13400)
11+
* Fix a crash in `read_double`. [#13435](https://github.com/Microsoft/vscode-cpptools/issues/13435)
12+
* Fix the handling of default file associations for certain file extensions. [PR #13455](https://github.com/microsoft/vscode-cpptools/pull/13455)
13+
* Fix shell parsing of the arguments of a full command line in `compilerPath`. [PR #13468](https://github.com/microsoft/vscode-cpptools/pull/13468)
14+
* Fix C and CUDA files being interpreted as C++ in `compile_commands.json`. [#13471](https://github.com/microsoft/vscode-cpptools/issues/13471)
15+
* Stop automatically mapping a `.C` file to C++ if it's already set in `files.associations`. [PR #13476](https://github.com/microsoft/vscode-cpptools/pull/13476)
16+
* Fix issues with the `recursiveIncludes` properties in the configuration UI editor. [PR #13498](https://github.com/microsoft/vscode-cpptools/pull/13498)
17+
* Fix IntelliSense not updating after the language ID is changed, and prevent the language ID from being changed if it's set from `compile_commands.json` or a configuration provider.
18+
* Update clang-tidy and clang-format from 20.1.2 to 20.1.3 (which has some bug fixes).
19+
* Fix a case where language server crash messages appear after 4 minutes.
20+
* Fix a crash with Copilot hover.
21+
* Fix some translation issues.
22+
323
## Version 1.24.5: April 3, 2025
424
### New Feature
525
* Add support for Copilot descriptions in hover tooltips, controlled by the `C_Cpp.copilotHover` setting. [PR #13385](https://github.com/microsoft/vscode-cpptools/pull/13385)

Extension/i18n/chs/package.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
"c_cpp.configuration.hover.description": "如果禁用,则语言服务器不再提供悬停详细信息。",
255255
"c_cpp.configuration.vcpkg.enabled.markdownDescription": "为 [vcpkg 依存关系管理器](https://aka.ms/vcpkg/) 启用集成服务。",
256256
"c_cpp.configuration.addNodeAddonIncludePaths.markdownDescription": "当来自 `nan` 和 `node-addon-api` 的包含路径为依赖项时,请将其添加。",
257-
"c_cpp.configuration.copilotHover.markdownDescription": "如果 `disabled`,则悬停时不会显示任何 Copilot 信息",
257+
"c_cpp.configuration.copilotHover.markdownDescription": "如果为 `disabled`,则悬停时不会显示“生成 Copilot 摘要”选项",
258258
"c_cpp.configuration.renameRequiresIdentifier.markdownDescription": "如果为 `true`,则“重命名符号”将需要有效的 C/C++ 标识符。",
259259
"c_cpp.configuration.autocompleteAddParentheses.markdownDescription": "如果为 `true`,则自动完成将在函数调用后自动添加 `(` ,在这种情况下,也可以添加 `)` ,具体取决于 `#editor.autoClosingBrackets#` 设置的值。",
260260
"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)。",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"cannot.find": "无法找到: {0}",
1515
"cannot.resolve.compiler.path": "输入无效,无法解析编译器路径",
1616
"path.is.not.a.file": "路径不是文件: {0}",
17+
"wrapped.with.quotes": "不要在路径周围添加额外的引号。",
1718
"path.is.not.a.directory": "路径不是目录: {0}",
1819
"duplicate.name": "{0} 重复。配置名称应是唯一的。",
1920
"multiple.paths.not.allowed": "不允许使用多个路径。",

Extension/i18n/chs/src/nativeStrings.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,5 +319,5 @@
319319
"file_not_found_in_path2": "在 compile_commands.json 文件中找不到 \"{0}\"。此文件将改用文件夹“{1}”中的 c_cpp_properties.json 中包含的 \"includePath\"",
320320
"copilot_hover_link": "生成 Copilot 摘要",
321321
"browse_path_not_found": "无法为不存在的文件夹 {0} 中的文件编制索引",
322-
"license_terms": "C/C++ 扩展只能与 Microsoft Visual Studio、Visual Studio for Mac、Visual Studio Code、Azure DevOps、Team Foundation Server 以及后续的 Microsoft 产品和服务一起使用,以开发和测试您的应用程序。"
322+
"license_terms": "C/C++ 扩展只能用于 Microsoft Visual Studio、Visual Studio for Mac、Visual Studio Code、Azure DevOps、Team Foundation Server 以及后续的 Microsoft 产品和服务,以开发和测试您的应用程序。"
323323
}

Extension/i18n/chs/ui/settings.html.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"edit.configurations.json": "C/C++: 编辑配置(JSON)",
1414
"check.the.schema": "转到 {0},详细了解 C/C++ 属性。",
1515
"cpp.properties.schema.reference": "C/C++ 属性架构参考",
16-
"view.schema.reference": "属性架构引用",
16+
"view.schema.reference": "属性架构参考",
1717
"intellisense.configurations": "IntelliSense 配置",
1818
"intellisense.configurations.description": "使用此编辑器编辑在基础 {0} 文件中定义的 IntelliSense 设置。在此编辑器中所做的更改仅适用于所选的配置。要一次编辑多个配置,请转到 {1}。",
1919
"configuration.name": "配置名称",
@@ -67,10 +67,10 @@
6767
"limit.symbols.checkbox": "如果为 {0} (或已勾选),则标记分析器将仅分析在 {1} 中由源文件直接或间接包含的代码文件。如果为 {2} (或未选中),标记分析器将分析在 {3} 列表内指定路径中找到的所有代码文件。",
6868
"database.filename": "浏览: 数据库文件名",
6969
"database.filename.description": "所生成的符号数据库的路径。这指示扩展将标记分析器的符号数据库保存在工作区默认存储位置以外的其他位置。如果指定了相对路径,则它将相对于工作区的默认存储位置(而不是工作区文件夹本身)。{0} 变量可用于指定相对于工作区文件夹的路径(例如 {1})。",
70-
"recursiveIncludes.reduce": "递归包括: 优先级",
70+
"recursiveIncludes.reduce": "递归包括: 缩减",
7171
"recursiveIncludes.reduce.description": "设置为 {0} 可将提供给 IntelliSense 的递归包含路径数减少到仅限当前由 #include 语句引用的路径。这需要首先分析文件以确定包含哪些文件。设置为 {1} 可将所有递归包含路径提供给 IntelliSense。当涉及到大量递归包含路径时,减少递归包含路径的数量可能会提高 IntelliSense 性能。如果不减少递归包含路径的数量,则可以通过避免需要分析文件以确定要提供的包含路径来提高 IntelliSense 性能。",
7272
"recursiveIncludes.priority": "递归包括: 优先级",
7373
"recursiveIncludes.priority.description": "递归包含路径的优先级。如果设置为 {0},则将在系统包含路径之前搜索递归包含路径。如果设置为 {1},则将在系统包含路径之后搜索递归包含路径。",
74-
"recursiveIncludes.order": "递归包括: 优先级",
74+
"recursiveIncludes.order": "递归包括: 顺序",
7575
"recursiveIncludes.order.description": "搜索递归包含路径下子目录的顺序。"
7676
}

Extension/i18n/cht/package.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
"c_cpp.configuration.hover.description": "如果停用,語言伺服器將不再提供暫留詳細資料。",
255255
"c_cpp.configuration.vcpkg.enabled.markdownDescription": "啟用 [vcpkg 相依性管理員](https://aka.ms/vcpkg/) 的整合服務。",
256256
"c_cpp.configuration.addNodeAddonIncludePaths.markdownDescription": "當 `nan` 和 `node-addon-api` 為相依性時,從中新增 include 路徑。",
257-
"c_cpp.configuration.copilotHover.markdownDescription": "如果`disabled`,則暫留中將不會顯示 Copilot 資訊",
257+
"c_cpp.configuration.copilotHover.markdownDescription": "如果 `disabled`,暫留時將不會顯示 [產生 Copilot 摘要] 選項",
258258
"c_cpp.configuration.renameRequiresIdentifier.markdownDescription": "若為 `true`,則「重新命名符號」需要有效的 C/C++ 識別碼。",
259259
"c_cpp.configuration.autocompleteAddParentheses.markdownDescription": "若為 `true`,自動完成將會在函式呼叫之後自動新增 `(`,在這種情況下也可能會新增 `)`,取決於 `editor.autoClosingBrackets` 設定的值。",
260260
"c_cpp.configuration.filesExclude.markdownDescription": "設定 Glob 模式以排除資料夾 (若變更 `#C_Cpp.exclusionPolicy#`,則也會排除檔案)。這些模式為 C/C++ 延伸模組所特有,且是對 `#files.exclude#` 的外加,但與 `#files.exclude#` 不同的是,它們也適用於目前工作區資料夾以外的路徑,並且不會將其從總管檢視中移除。深入了解 [Glob 模式](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options)。",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"cannot.find": "找不到: {0}",
1515
"cannot.resolve.compiler.path": "輸入無效,無法解析編譯器路徑",
1616
"path.is.not.a.file": "路徑不是檔案: {0}",
17+
"wrapped.with.quotes": "請勿在路徑周圍新增額外的引號。",
1718
"path.is.not.a.directory": "路徑不是目錄: {0}",
1819
"duplicate.name": "{0} 重複。組態名稱應該是唯一的。",
1920
"multiple.paths.not.allowed": "不允許使用多個路徑。",

Extension/i18n/cht/src/nativeStrings.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,5 +319,5 @@
319319
"file_not_found_in_path2": "在 compile_commands.json 檔案中找不到 \"{0}\"。將對此檔案改用資料夾 '{1}' 中 c_cpp_properties.json 的 'includePath'。",
320320
"copilot_hover_link": "產生 Copilot 摘要",
321321
"browse_path_not_found": "無法為以下不存在的資料夾中的檔案編製索引:{0}",
322-
"license_terms": "C/C++ 擴展只能與 Microsoft Visual Studio、Visual Studio for Mac、Visual Studio Code、Azure DevOps、Team Foundation Server 以及後續的 Microsoft 產品和服務一起使用,以開發和測試您的應用程式。"
322+
"license_terms": "C/C++ 擴充功能僅能與 Microsoft Visual Studio、Visual Studio for Mac、Visual Studio Code、Azure DevOps、Team Foundation Server 及後續的 Microsoft 產品與服務搭配使用,以開發和測試您的應用程式。"
323323
}

Extension/i18n/cht/ui/settings.html.i18n.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
"limit.symbols.checkbox": "若為 {0} (或已選取),標籤剖析器只會剖析 {1} 中原始程式檔直接或間接包含的程式碼檔。若為 {2} (或未選取),標籤剖析器會剖析在 {3} 清單中的指定路徑找到的所有程式碼檔。",
6868
"database.filename": "瀏覽: 資料庫檔案名稱",
6969
"database.filename.description": "產生符號資料庫路徑。這會指示延伸模組將標籤剖析器的符號資料庫儲存在工作區預設儲存位置以外的某處。如果指定了相對路徑,就會是相對於工作區預設儲存位置 (非工作區資料夾本身) 的路徑。{0} 變數可用於指定相對於工作區資料夾的路徑 (例如 {1})。",
70-
"recursiveIncludes.reduce": "遞迴包含: 優先順序",
70+
"recursiveIncludes.reduce": "遞迴包含: 減少",
7171
"recursiveIncludes.reduce.description": "設定為 {0},可使 IntelliSense 僅提供目前由 #include 陳述式參考的遞迴包含路徑。這需要先剖析檔案,以確定包含哪些檔案。設定為 {1} 以將所有遞迴包含路徑提供給 IntelliSense。當涉及非常大量的遞迴包含路徑時,減少遞迴包含路徑數目可能會改善 IntelliSense 的效能。不減少遞迴包含路徑的數量,可避免需要剖析檔案以決定要提供哪些包含路徑,從而 IntelliSense 效能。",
7272
"recursiveIncludes.priority": "遞迴包含: 優先順序",
7373
"recursiveIncludes.priority.description": "遞迴包含路徑的優先順序。如果設定為 {0},則會在系統包含路徑之前搜尋遞迴包含路徑。如果設定為 {1},則會在系統包含路徑之後搜尋遞迴包含路徑。",
74-
"recursiveIncludes.order": "遞迴包含: 優先順序",
74+
"recursiveIncludes.order": "遞迴包含: 順序",
7575
"recursiveIncludes.order.description": "搜尋遞迴包含路徑下子目錄的順序。"
7676
}

Extension/i18n/csy/package.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
"c_cpp.configuration.hover.description": "Pokud je tato možnost zakázaná, podrobnosti o najetí myší už nebude poskytovat jazykový server.",
255255
"c_cpp.configuration.vcpkg.enabled.markdownDescription": "Povolte integrační služby pro [správce závislostí vcpkg](https://aka.ms/vcpkg/).",
256256
"c_cpp.configuration.addNodeAddonIncludePaths.markdownDescription": "Pokud existují závislosti, přidejte cesty pro zahrnuté soubory z `nan` a `node-addon-api`.",
257-
"c_cpp.configuration.copilotHover.markdownDescription": "Pokud je tato možnost `disabled`, v hoveru se nezobrazí žádné informace Copilot.",
257+
"c_cpp.configuration.copilotHover.markdownDescription": "Pokud je zakázáno (`disabled`), při najetí myší se nezobrazí možnost Vygenerovat souhrn Copilotu.",
258258
"c_cpp.configuration.renameRequiresIdentifier.markdownDescription": "Když se tato hodnota nastaví na `true`, operace Přejmenovat symbol bude vyžadovat platný identifikátor C/C++.",
259259
"c_cpp.configuration.autocompleteAddParentheses.markdownDescription": "Pokud je hodnota `true`, automatické dokončování automaticky přidá za volání funkcí znak `(`. V takovém případě se může přidat i znak `)`, což záleží na hodnotě nastavení `#editor.autoClosingBrackets#`.",
260260
"c_cpp.configuration.filesExclude.markdownDescription": "Nakonfigurujte vzory glob pro vyloučení složek (a souborů, pokud se změní `#C_Cpp.exclusionPolicy#`). Ty jsou specifické pro rozšíření C/C++ a doplňují `#files.exclude#`, ale na rozdíl od `#files.exclude#` platí také pro cesty mimo aktuální složku pracovního prostoru a neodebírají se ze zobrazení Průzkumníka. Přečtěte si další informace o [vzorech glob](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options).",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"cannot.find": "Nepovedlo se najít: {0}",
1515
"cannot.resolve.compiler.path": "Neplatný vstup, nedá se přeložit cesta ke kompilátoru.",
1616
"path.is.not.a.file": "Cesta není soubor: {0}",
17+
"wrapped.with.quotes": "Nepřidávejte nadbytečné uvozovky kolem cest.",
1718
"path.is.not.a.directory": "Cesta není adresář: {0}",
1819
"duplicate.name": "{0} je duplicitní. Název konfigurace by měl být jedinečný.",
1920
"multiple.paths.not.allowed": "Více cest není povoleno.",

Extension/i18n/csy/src/nativeStrings.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,5 +319,5 @@
319319
"file_not_found_in_path2": "V souborech compile_commands.json se nepovedlo najít {0}. Pro tento soubor se místo toho použije includePath ze souboru c_cpp_properties.json ve složce {1}.",
320320
"copilot_hover_link": "Vygenerovat souhrn Copilotu",
321321
"browse_path_not_found": "Nelze indexovat soubory z neexistující složky: {0}",
322-
"license_terms": "Rozšíření C/C++ lze použít pouze s produkty a službami Microsoft Visual Studio, Visual Studio for Mac, Visual Studio Code, Azure DevOps, Team Foundation Server a nástupnickými produkty a službami společnosti Microsoft k vývoji a testování vašich aplikací."
322+
"license_terms": "Rozšíření C/C++ lze používat pouze s těmito produkty a službami pro vývoj a testování aplikací a nástupci těchto produktů a služeb od Microsoftu: Microsoft Visual Studio, Visual Studio pro Mac, Visual Studio Code, Azure DevOps a Team Foundation Server."
323323
}

0 commit comments

Comments
 (0)