Skip to content

Commit d22275f

Browse files
Merge branch 'main' into orkun_presets_30_07_2025
2 parents 7a616ff + 7eb9513 commit d22275f

File tree

65 files changed

+593
-734
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

+593
-734
lines changed

.github/actions/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"keywords": [],
1111
"author": "",
1212
"dependencies": {
13-
"@actions/core": "^1.9.1",
14-
"@actions/github": "^2.1.1"
13+
"@actions/core": "^1.11.1",
14+
"@actions/github": "^6.0.1"
1515
},
1616
"devDependencies": {
17-
"eslint": "^8.1.0",
18-
"typescript": "^3.8.3"
17+
"eslint": "^9.32.0",
18+
"typescript": "^5.9.2"
1919
}
2020
}

.github/actions/yarn.lock

Lines changed: 378 additions & 573 deletions
Large diffs are not rendered by default.

.github/workflows/ci-main-mac.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ jobs:
3838
with:
3939
cmakeVersion: 3.18.3
4040
ninjaVersion: 1.10.1
41+
42+
- name: Remove conflicting system CMake installation
43+
# The electron test runner modifies PATH priority, so we remove system CMake to ensure our installed version of CMake is used
44+
run: |
45+
sudo rm -f /usr/local/bin/cmake
46+
sudo rm -f /usr/local/bin/cmake-gui
47+
sudo rm -f /usr/local/bin/ccmake
48+
sudo rm -f /usr/local/bin/cmcldeps
49+
sudo rm -f /usr/local/bin/cpack
50+
sudo rm -f /usr/local/bin/ctest
4151
4252
- name: Build fake compilers for tests
4353
uses: urkle/[email protected]

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Features:
1010
- Add `cmake.exclude` setting that allows users to set folders that they want the CMake Tools extension to ignore. [#4112](https://github.com/microsoft/vscode-cmake-tools/issues/4112)
1111
- Add a command to substitute CMake Cache variables in `launch.json` and `tasks.json`. [#4422](https://github.com/microsoft/vscode-cmake-tools/pull/4422)
1212
- Add support for presets v10. [#4459](https://github.com/microsoft/vscode-cmake-tools/issues/4459), [#4445](https://github.com/microsoft/vscode-cmake-tools/issues/4452)
13+
- Add pre-fill project name using current folder name [#4533](https://github.com/microsoft/vscode-cmake-tools/pull/4533) [@HO-COOH](https://github.com/HO-COOH)
1314
- Add API v5 which adds presets api. [#4510](https://github.com/microsoft/vscode-cmake-tools/issues/4510) [@OrkunTokdemir](https://github.com/OrkunTokdemir)
1415

1516
Improvements:
@@ -34,6 +35,7 @@ Bug Fixes:
3435
- Fix bug that makes some build hang [#4424](https://github.com/microsoft/vscode-cmake-tools/issues/4424) and [#4465](https://github.com/microsoft/vscode-cmake-tools/issues/4465)
3536
- Fix issue with switching to presets during Quick Start. [#4409](https://github.com/microsoft/vscode-cmake-tools/issues/4409)
3637
- Fix bug that shows empty lines in Pinned Commands view. [#4406](https://github.com/microsoft/vscode-cmake-tools/issues/4406)
38+
- Fix Compiler Warnings not shown in Problems Window [#4567]https://github.com/microsoft/vscode-cmake-tools/issues/4567
3739

3840
## 1.20.53
3941

i18n/chs/package.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"cmake-tools.command.cmake.stop.title": "取消生成",
7474
"cmake-tools.command.cmake.stopAll.title": "取消所有项目的生成",
7575
"cmake-tools.command.cmake.resetState.title": "重置 CMake Tools 扩展状态(用于故障排除)",
76-
"cmake-tools.command.cmake.openSettings.title": "打开 CMake 工具扩展设置",
76+
"cmake-tools.command.cmake.openSettings.title": "打开 CMake Tools 扩展设置",
7777
"cmake-tools.command.cmake.selectActiveFolder.title": "选择活动文件夹",
7878
"cmake-tools.command.cmake.outline.runUtilityTarget.title": "运行实用工具",
7979
"cmake-tools.command.cmake.outline.debugTarget.title": "调试",
@@ -82,7 +82,7 @@
8282
"cmake-tools.command.cmake.outline.setLaunchTarget.title": "设置启动/调试目标",
8383
"cmake-tools.command.cmake.outline.revealInCMakeLists.title": "打开 CMakeLists.txt",
8484
"cmake-tools.command.cmake.folders.setActiveFolder.title": "设置活动文件夹",
85-
"cmake-tools.configuration.title": "CMake 工具配置",
85+
"cmake-tools.configuration.title": "CMake Tools 配置",
8686
"cmake-tools.configuration.cmake.cmakePath.description": "要使用的 CMake 可执行文件的名称/路径。",
8787
"cmake-tools.configuration.cmake.buildDirectory.description": "CMake 生成文件将转到其中的目录。",
8888
"cmake-tools.configuration.cmake.installPrefix.description": "CMake 安装文件将转到其中的目录。",
@@ -211,7 +211,7 @@
211211
"cmake-tools.configuration.cmake.ignoreCMakeListsMissing.description": "如果为 `true`,则当在工作区中找到 CMakeLists.txt 文件,但未在根文件夹中找到时,扩展将不会要求用户选择 CMakeLists.txt 文件以进行配置。",
212212
"cmake-tools.configuration.cmake.launchBehavior.description": "控制启动目标时启动终端将执行的操作。",
213213
"cmake-tools.configuration.cmake.automaticReconfigure.description": "当工具包或配置预设发生更改时,将自动配置 CMake 项目目录。",
214-
"cmake-tools.configuration.cmake.pinnedCommands.description": "默认情况下始终固定的 CMake 命令列表。这些内容将显示在 CMake 工具边栏“固定的命令”部分中。",
214+
"cmake-tools.configuration.cmake.pinnedCommands.description": "默认情况下始终固定的 CMake 命令列表。这些内容将显示在 CMake Tools 边栏“固定的命令”部分中。",
215215
"cmake-tools.configuration.cmake.enableAutomaticKitScan.description": "未选择工具包时启用工具包的自动扫描。这只会在未使用 CMake 预设时生效。",
216216
"cmake-tools.configuration.cmake.enableLanguageServices.description": "为 CMake 文件启用语言服务。这将启用语法突出显示、代码完成和其他功能。",
217217
"cmake-tools.configuration.cmake.preRunCoverageTarget.description": "使用测试资源管理器运行覆盖率测试之前要生成的目标",

i18n/chs/schemas/variants-schema.json.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Do not edit this file. It is machine generated.
66
{
77
"schemas/variants-schema.json.": "变量选项",
8-
"schemas/variants-schema.json.patternProperties.base\\$": "所有变量的基本组合(未对 CMake 工具实现)",
8+
"schemas/variants-schema.json.patternProperties.base\\$": "所有变量的基本组合(未对 CMake Tools 实现)",
99
"schemas/variants-schema.json.patternProperties.^\\w+$.properties.description": "此选项的说明",
1010
"schemas/variants-schema.json.patternProperties.^\\w+$.properties.default": "此选项的默认设置",
1111
"schemas/variants-schema.json.patternProperties.^\\w+$.properties.choices": "可能的选项值",

i18n/chs/src/cmakeProject.i18n.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"loading.new.workflow.preset": "将新工作流预设加载到 CMake 驱动程序中",
4646
"unable.to.set.workflow.preset": "无法设置工作流预设 {0}。",
4747
"error.on.switch.workflow.preset": "切换工作流预设时出错 ({0})",
48-
"disposing.extension": "正在释放 CMake 工具扩展",
48+
"disposing.extension": "正在释放 CMake Tools 扩展",
4949
"extension.dispose": "扩展释放",
5050
"using.user.generator": "从用户配置使用生成器: {0}",
5151
"configuration.already.in.progress": "配置已在进行中。",
@@ -66,7 +66,7 @@
6666
"unable.to.execute.program": "无法执行程序,不存在有效的 cmake 驱动程序实例。",
6767
"shutting.down.driver": "正在关闭 CMake 驱动程序",
6868
"reloading.driver": "正在重新加载 CMake 驱动程序",
69-
"second.phase.init": "正在启动 CMake 工具第二阶段初始化",
69+
"second.phase.init": "正在启动 CMake Tools 第二阶段初始化",
7070
"active.build.variant.changed": "活动的生成变量已更改",
7171
"changing.build.variant": "正在更改生成变量",
7272
"injecting.new.kit": "将新的工具包注入 CMake 驱动程序",

i18n/chs/src/cmakeTaskProvider.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"dismiss": "关闭",
2323
"task.not.compatible.with.preset.setting": "所选任务请求 CMakePreset,但没有为 CMakePreset 配置工作区",
2424
"workspace.is": "工作区为 {0}",
25-
"cmake.tools.not.found": "找不到 CMake 工具",
25+
"cmake.tools.not.found": "找不到 CMake Tools",
2626
"task.failed": "任务失败。",
2727
"config.started": "配置任务已启动...",
2828
"configure.on.edit": "使用预设运行配置任务时,将 configureOnEdit 设置为 true 可能会覆盖任务配置。",

i18n/chs/src/extension.i18n.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"rereading.kits": "重新读取工具包",
88
"language.service.failed": "未能初始化语言服务",
9-
"dispose.cmake.tools": "释放 CMake 工具",
9+
"dispose.cmake.tools": "释放 CMake Tools",
1010
"configuring.workspace.on.open": "正在打开的 {0} 上配置工作区",
1111
"configure.now.button": "立即配置",
1212
"configure.recommended": "建议在升级到新的工具包定义后重新配置。",
@@ -49,8 +49,8 @@
4949
"register.command": "注册 CMakeTools 扩展命令 {0}",
5050
"uninstall.old.cmaketools": "请卸载 CMake Tools 扩展的所有较早版本。现在自版本 1.2.0 起,它由 Microsoft 发布。",
5151
"uninstall.twxs.uninstall": "卸载 twxs.cmake",
52-
"uninstall.twxs.cmaketools": "建议卸载 twxs.cmake 扩展。CMake 工具扩展现在提供语言服务,已不再依赖于 twxs.cmake。",
53-
"options.moved.notification.body": "CMake 工具中的某些状态栏选项现在已移动到 CMake 工具边栏中的项目状态视图。可以在设置中使用“cmake.options”属性自定义视图。",
52+
"uninstall.twxs.cmaketools": "建议卸载 twxs.cmake 扩展。CMake Tools 扩展现在提供语言服务,已不再依赖于 twxs.cmake。",
53+
"options.moved.notification.body": "CMake Tools 中的某些状态栏选项现在已移动到 CMake Tools 边栏中的项目状态视图。可以在设置中使用“cmake.options”属性自定义视图。",
5454
"options.moved.notification.configure.cmake.options": "配置 CMake 选项可见性",
5555
"options.moved.notification.do.not.show": "不再显示",
5656
"deactivate.cmaketools": "停用 CMakeTools"

i18n/cht/package.i18n.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"cmake-tools.command.cmake.viewPackageSettings.title": "檢視覆寫您封裝預設的設定",
2020
"cmake-tools.command.cmake.selectPackagePreset.title": "選取封裝預設",
2121
"cmake-tools.command.cmake.selectWorkflowPreset.title": "選取工作流程預設",
22-
"cmake-tools.command.cmake.viewLog.title": "開啟 CMake 工具記錄檔",
22+
"cmake-tools.command.cmake.viewLog.title": "開啟 CMake Tools 記錄檔",
2323
"cmake-tools.command.cmake.logDiagnostics.title": "記錄診斷",
2424
"cmake-tools.command.cmake.editKits.title": "編輯使用者本機 CMake 套件",
2525
"cmake-tools.command.cmake.scanForKits.title": "掃描套件",
@@ -72,8 +72,8 @@
7272
"cmake-tools.command.cmake.selectLaunchTarget.title": "設定啟動/偵錯目標",
7373
"cmake-tools.command.cmake.stop.title": "取消建置",
7474
"cmake-tools.command.cmake.stopAll.title": "取消所有專案的組建",
75-
"cmake-tools.command.cmake.resetState.title": "重設 CMake 工具延伸模組狀態 (進行疑難排解)",
76-
"cmake-tools.command.cmake.openSettings.title": "開啟 CMake 工具延伸模組設定",
75+
"cmake-tools.command.cmake.resetState.title": "重設 CMake Tools 延伸模組狀態 (進行疑難排解)",
76+
"cmake-tools.command.cmake.openSettings.title": "開啟 CMake Tools 延伸模組設定",
7777
"cmake-tools.command.cmake.selectActiveFolder.title": "選取作用中的資料夾",
7878
"cmake-tools.command.cmake.outline.runUtilityTarget.title": "執行公用程式",
7979
"cmake-tools.command.cmake.outline.debugTarget.title": "偵錯",
@@ -82,7 +82,7 @@
8282
"cmake-tools.command.cmake.outline.setLaunchTarget.title": "設定啟動/偵錯目標",
8383
"cmake-tools.command.cmake.outline.revealInCMakeLists.title": "開啟 CMakeLists.txt",
8484
"cmake-tools.command.cmake.folders.setActiveFolder.title": "設定作用中的資料夾",
85-
"cmake-tools.configuration.title": "CMake 工具組態",
85+
"cmake-tools.configuration.title": "CMake Tools 組態",
8686
"cmake-tools.configuration.cmake.cmakePath.description": "要使用的 CMake 可執行檔名稱/路徑。",
8787
"cmake-tools.configuration.cmake.buildDirectory.description": "接收 CMake 建置檔案的目錄。",
8888
"cmake-tools.configuration.cmake.installPrefix.description": "接收 CMake 已安裝檔案的目錄。",
@@ -211,7 +211,7 @@
211211
"cmake-tools.configuration.cmake.ignoreCMakeListsMissing.description": "如果為 `true`,當工作區中找到某個檔案但卻不在根資料夾中時,延伸就不會要求使用者選取要設定的 CMakeLists.txt 檔案。",
212212
"cmake-tools.configuration.cmake.launchBehavior.description": "控制啟動終端機在您啟動目標時要執行的動作。",
213213
"cmake-tools.configuration.cmake.automaticReconfigure.description": "當套件或設定預設變更時,自動設定 CMake 專案目錄。",
214-
"cmake-tools.configuration.cmake.pinnedCommands.description": "默認永遠釘選的 CMake 命令清單。這些會出現在 [CMake 工具] 側邊欄的 [已釘選的命令] 區段中。",
214+
"cmake-tools.configuration.cmake.pinnedCommands.description": "默認永遠釘選的 CMake 命令清單。這些會出現在 [CMake Tools] 側邊欄的 [已釘選的命令] 區段中。",
215215
"cmake-tools.configuration.cmake.enableAutomaticKitScan.description": "未選取套件時啟用套件的自動掃描。只有在未使用 CMake 預設時才會生效。",
216216
"cmake-tools.configuration.cmake.enableLanguageServices.description": "啟用 CMake 檔案的語言服務。這將啟用語法強調、程式碼完成及其他功能。",
217217
"cmake-tools.configuration.cmake.preRunCoverageTarget.description": "使用測試總管對涵蓋範圍執行測試之前的建置目標",

0 commit comments

Comments
 (0)