Merge branch 'main' into feature/add-cpp-name-demangling

Author: gcampbell-msft

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

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/close-old-issues.yml

@@ -21,7 +21,7 @@ jobs:
       stale-label: stale-old
       stale-exempt-label: stale-exempt
     steps:
-    - uses: actions/stale@v4.1.1
+    - uses: actions/stale@v5.1.0
       with:
         stale-issue-label: ${{ env.stale-label }}
         exempt-issue-labels: ${{ env.stale-exempt-label }}

.github/workflows/close-stale-issues.yml

@@ -13,7 +13,7 @@ jobs:
       stale-exempt-label: stale-exempt
       only-label: more info needed
     steps:
-    - uses: actions/stale@v4.1.1
+    - uses: actions/stale@v5.1.0
       with:
         stale-issue-label: ${{ env.stale-label }}
         exempt-issue-labels: ${{ env.stale-exempt-label }}

CHANGELOG.md

@@ -5,6 +5,7 @@
 Features:
 
 - Add an option to specify the launch target for debugging CTest tests. [#4273](https://github.com/microsoft/vscode-cmake-tools/pull/4273)
+- Add a setting to enable/disable our built-in language services. [#4290](https://github.com/microsoft/vscode-cmake-tools/issues/4290)
 
 Improvements:
 
@@ -16,6 +17,9 @@ Bug Fixes:
 - Fix bug that makes `Configure Task` lists only first folder in workspace. [#3232](https//github.com/microsoft/vscode-cmake-tools/issues/3232)
 - Fix displaying "Go to Test" in the Test Explorer when the DEF_SOURCE_LINE property is set, but there is no backtrace information present. [#4321](https://github.com/microsoft/vscode-cmake-tools/pull/4321) [@rjaegers](https://github.com/rjaegers)
 - Fix gnuld error parsing false positive on make errors, false negative due to trailing \r, and false parsing of new "multiple definitions" error [#2864](https://github.com/microsoft/vscode-cmake-tools/issues/2864) [@0xemgy](https://github.com/0xemgy)
+- Fixes for small bug string bugs. [#4319](https://github.com/microsoft/vscode-cmake-tools/issues/4319), [#4317](https://github.com/microsoft/vscode-cmake-tools/issues/4317), [#4312](https://github.com/microsoft/vscode-cmake-tools/issues/4312)
+- Fixes localization for "workspace is" string. [#4374](https://github.com/microsoft/vscode-cmake-tools/issues/4374)
+- Make tooltips for selecting Launch/Debug Target. [#4373](https://github.com/microsoft/vscode-cmake-tools/issues/4373)
 
 ## 1.20.53
 

README.md

@@ -1,28 +1,80 @@
-# CMake Tools
+<h1 align=center> <img align=center width=48 src="res/logo-margin-bottom.png" alt="CMake Logo"/> CMake Tools </h1>
 
-[CMake Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) provides the native developer a full-featured, convenient, and powerful workflow for CMake-based projects in Visual Studio Code.
+<p align=center ><i>Enhancing CMake development in VS Code.</i></p>
 
-## Important doc links
+<div align=center>
+    <img alt="VS Code" src="https://img.shields.io/badge/VSCode-7d57c2?style=for-the-badge&logo=visual%20studio%20code&logoColor=white"/>
+    <img alt="CMake" src="https://img.shields.io/badge/CMake-7d57c2?style=for-the-badge&logo=cmake&logoColor=white"/>
+    <img alt="C" src="https://img.shields.io/badge/C-7d57c2?style=for-the-badge&logo=c&logoColor=white"/>
+    <img alt="C++" src="https://img.shields.io/badge/C%2B%2B-7d57c2?style=for-the-badge&logo=c%2B%2B&logoColor=white"/>
+</div>
 
-- [CMake Tools quick start](https://code.visualstudio.com/docs/cpp/CMake-linux)
-- [Configure and build a project with CMake Presets](docs/cmake-presets.md)
-- [Configure a project with kits and variants](docs/how-to.md#configure-a-project)
-- [Build a project with kits and variants](docs/how-to.md#build-a-project)
-- [Configure and build a project using tasks](docs/tasks.md)
-- [Debug a project](docs/how-to.md#debug-a-project)
-- [Configure CMake Tools settings](docs/cmake-settings.md)
-- [How to](docs/how-to.md)
-- [FAQ](docs/faq.md)
-- [Read the online documentation](docs/README.md)
-- [Contribute](CONTRIBUTING.md)
-- [Extensibility](EXTENSIBILITY.md)
+<div align=center>
+    <img alt="VS Code Marketplace Downloads" src="https://img.shields.io/visual-studio-marketplace/d/ms-vscode.cmake-tools?style=for-the-badge&color=064f8c&cacheSeconds=3600&link=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dms-vscode.cmake-tools">
+    <img alt="VS Code Marketplace Version" src="https://img.shields.io/visual-studio-marketplace/v/ms-vscode.cmake-tools?style=for-the-badge&color=be2128&cacheSeconds=3600&link=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%2Fms-vscode.cmake-tools%2Fchangelog">
+    <img alt="Closed Issues" src="https://img.shields.io/github/issues-closed/microsoft/vscode-cmake-tools?style=for-the-badge&color=249847&cacheSeconds=3600&link=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode-cmake-tools%2Fissues">
+</div>
 
-## Issues? Questions? Feature requests?
+<br/>
+<img style="width: 100%" src="res/graphics/cmake-tools-banner.png" alt="CMake Tools Banner"/>
 
-**PLEASE**, if you experience any problems, have any questions, or have an idea
-for a new feature, create an issue on [the GitHub page](https://github.com/microsoft/vscode-cmake-tools)!
+## Introduction
+[CMake Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) provides the native developer a full-featured, convenient, and powerful workflow for CMake-based projects in Visual Studio Code. It simplifies advanced configurations with support for CMake presets and enhances the development experience by supporting rich IntelliSense features, a built-in debugger for CMake scripts, and configurable CMake tasks. Its customizable interface allows for efficient tailored control of projects, while CTest integration ensures straightforward test execution and monitoring.
 
-This extension currently provides basic language support for CMake built into the extension. 
+<details open>
+<summary>
+ Features
+</summary><br/>
+
+<p align=center>
+    <img width="49%" src="res/graphics/presets-support-feature.png" alt="Presets Support"/>
+&nbsp;
+    <img width="49%" src="res/graphics/cmake-language-service-feature.png" alt="Built-In CMake Language Services"/>
+</p>
+<p align=center>
+    <img width="49%" src="res/graphics/cmake-debugging-feature.png" alt="CMake Debugging"/>
+&nbsp;
+    <img width="49%" src="res/graphics/status-and-sidebar-feature.png" alt="Project Status"/>
+</p>
+<p align=center>
+    <img width="49%" src="res/graphics/cmake-commands-feature.png" alt="CMake Commands"/>
+&nbsp;
+    <img width="49%" src="res/graphics/project-outline-feature.png" alt="Project Outline"/>
+</p>
+<p align=center>
+    <img width="49%" src="res/graphics/tasks-feature.png" alt="Tasks"/>  
+&nbsp;
+    <img width="49%" src="res/graphics/test-integration-feature.png" alt="Test Integration"/>
+</p>  
+
+</details>
+
+## Setup and Installation
+Ensure CMake is available on your system. A couple of options are:
+- [Download CMake](https://cmake.org/download/).
+- Utilize the CMake that is bundled with a Visual Studio installation.
+
+Install the CMake Tools extension from the Extensions pane within VS Code or from the [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools).
+
+Ensure that either you've added your CMake executable to your PATH, or you've adjusted the `cmake.cmakePath` setting to point to your CMake executable. 
+
+## Resources
+- [Docs](docs/README.md) for comprehensive documentation.
+- [Quick Start](https://code.visualstudio.com/docs/cpp/CMake-linux) to get up and running fast.
+- [Github](https://github.com/microsoft/vscode-cmake-tools) for source code, issues, and contributing.
+
+## Contributing
+We encourage an open and collaborative development environment and welcome all contributions. Whether you're fixing bugs, proposing new features, or improving our documentation - we invite you to join the CMake Tools community. Please review our [contribution guidelines](CONTRIBUTING.md) and adhere to our [code of conduct](https://opensource.microsoft.com/codeofconduct/).
+
+You can file issues with us using one of our templates:
+
+[Bug Report](https://github.com/microsoft/vscode-cmake-tools/issues/new?template=bugreport.yml): If you see an error message or encounter an issue while using the CMake Tools extension.
+
+[Feature Request](https://github.com/microsoft/vscode-cmake-tools/issues/new?template=featurerequest.yml): If you have a suggestion or need a feature that would enhance development.
+
+[Documentation Request](https://github.com/microsoft/vscode-cmake-tools/issues/new?template=docrequest.yml): Requesting changes or additions to the [CMake Tools documentation](docs/README.md).
+
+##
 
 ### Microsoft Open Source Code of Conduct
 
@@ -35,3 +87,9 @@ This extension collects usage data and sends it to Microsoft to help improve our
 ### Credits
 
 This project was started by [@vector-of-bool](https://github.com/vector-of-bool) and is now currently maintained by Microsoft.
+
+### Contributors
+
+<a href="https://github.com/microsoft/vscode-cmake-tools/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=microsoft/vscode-cmake-tools" alt="Contributors"/>
+</a>

docs/debug-launch.md

@@ -207,6 +207,7 @@ A couple of examples:
     "name": "(ctest) Launch",
     "type": "cppdbg",
     "request": "launch",
+    "presentation": { "hidden": true },
     // Resolved by CMake Tools:
     "cwd": "${cmake.testWorkingDirectory}",
     "program": "${cmake.testProgram}",
@@ -219,6 +220,7 @@ A couple of examples:
     "name": "(ctest) Launch",
     "type": "cppvsdbg",
     "request": "launch",
+    "presentation": { "hidden": true },
     // Resolved by CMake Tools:
     "program": "${cmake.testProgram}",
     "args": [ "${cmake.testArgs}"],

i18n/chs/package.i18n.json

@@ -78,8 +78,8 @@
 	"cmake-tools.command.cmake.outline.runUtilityTarget.title": "运行实用工具",
 	"cmake-tools.command.cmake.outline.debugTarget.title": "调试",
 	"cmake-tools.command.cmake.outline.launchTarget.title": "在终端中运行",
-	"cmake-tools.command.cmake.outline.setDefaultTarget.title": "设置为生成目标",
-	"cmake-tools.command.cmake.outline.setLaunchTarget.title": "设置为启动/调试目标",
+	"cmake-tools.command.cmake.outline.setDefaultTarget.title": "Set Build Target",
+	"cmake-tools.command.cmake.outline.setLaunchTarget.title": "Set Launch/Debug Target",
 	"cmake-tools.command.cmake.outline.revealInCMakeLists.title": "打开 CMakeLists.txt",
 	"cmake-tools.command.cmake.folders.setActiveFolder.title": "设置活动文件夹",
 	"cmake-tools.configuration.title": "CMake 工具配置",
@@ -109,6 +109,7 @@
 	"cmake-tools.configuration.cmake.ctest.allowParallelJobs.description": "允许并行运行 ctest，但结果输出可能会因此而乱码，并且测试资源管理器可能无法准确地反映测试进度。",
 	"cmake-tools.configuration.cmake.ctest.testExplorerIntegrationEnabled.description": "是否启用与测试资源管理器的集成。如果希望使用其他扩展进行测试集成，这有助于禁用。",
 	"cmake-tools.configuration.cmake.ctest.testSuiteDelimiter.markdownDescription": "可选分隔符，用于在测试资源管理器中以分层方式分隔测试套件名称和组合测试。此字符串用于正则表达式，因此某些分隔符可能需要转义。示例: `-` (一个分隔符: `-`)，`\\.|::` (两个分隔符: `.` 或 `::`。请注意，需要对 `.` 进行转义。)",
+	"cmake-tools.configuration.cmake.ctest.debugLaunchTarget.description": "在使用 CTest 调试测试时，从 launch.json 中获取目标名称以启动。默认情况下，如果目标不存在，将显示一个包含所有有空目标的选取器。",
 	"cmake-tools.configuration.cmake.parseBuildDiagnostics.description": "分析编译器输出以查找警告和错误。",
 	"cmake-tools.configuration.cmake.enabledOutputParsers.description": "要使用的输出分析程序。支持的分析程序 `cmake`、`gcc`、`gnuld`(适用于 GNULD 样式的 inker 输出)、`msvc`(适用于 Microsoft Visual C++)、`ghs`(适用于 Green Hills 编译器，具有 --no_wrap_diagnostics --brief_diagnostics)，以及 `diab`(适用于 Wind River Diab 编译器)。",
 	"cmake-tools.configuration.cmake.debugConfig.description": "要在调试目标时使用的调试配置。",

i18n/chs/src/cmakeTaskProvider.i18n.json

@@ -12,7 +12,9 @@
 	"configure": "配置",
 	"clean": "清理",
 	"clean.rebuild": "清理重新生成",
+	"project.not.found": "未找到项目。",
 	"cmake.template.task": "CMake 模板 {0} 任务",
+	"workspace.folder.not.found": "未找到工作区文件夹。",
 	"select.build.task": "选择一项生成任务",
 	"command.not.recognized": "{0} 不是已识别的命令。",
 	"target.is.ignored": "正在忽略此任务中定义的目标。",

i18n/chs/src/drivers/cmakeServerClient.i18n.json

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"started.new.cmake.server.instance": "已使用 PID {0} 启动新的 CMake Server 实例",
+	"started.new.cmake.server.instance": "已使用 PID {0} 启动新的 CMake 服务器实例",
 	"connection.terminated.unexpectedly": "与 cmake-server 的连接意外终止",
 	"cmake-server.exited.with.status": "cmake-server 已退出，状态为 {0} ({1})",
 	"unhandled.error.in": "{0} 中未处理的错误",

i18n/chs/src/expand.i18n.json

@@ -14,6 +14,6 @@
 	"circular.variable.reference": "循环变量引用",
 	"command.not.supported": "命令不支持字符串: {0}",
 	"exception.executing.command.full": "对字符串执行命令 {0} 时出现异常: {1} {2}",
-	"exception.executing.command": "异常执行命令",
+	"exception.executing.command": "执行命令时出现异常",
 	"expand.expandstringhelper": "已展开 {0}"
 }