Skip to content

Commit

Permalink
Merge pull request #9860 from microsoft/main
Browse files Browse the repository at this point in the history
Merge for 1.13.0
  • Loading branch information
sean-mcmanus authored Sep 7, 2022
2 parents c846e81 + 281d04f commit c2fdf75
Show file tree
Hide file tree
Showing 101 changed files with 2,333 additions and 1,002 deletions.
98 changes: 49 additions & 49 deletions Extension/CHANGELOG.md

Large diffs are not rendered by default.

43 changes: 22 additions & 21 deletions Extension/cgmanifest.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"Registrations": [
{
"Component": {
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/llvm/llvm-project",
"CommitHash": "0d44201451f03ba907cdb268ddddfc3fa38a0ebd"
},
"DevelopmentDependency": true
}
"$schema": "https://json.schemastore.org/component-detection-manifest.json",
"Registrations": [
{
"Component": {
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/llvm/llvm-project",
"CommitHash": "0d44201451f03ba907cdb268ddddfc3fa38a0ebd"
},
{
"Component": {
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/lldb-tools/lldb-mi",
"CommitHash": "2388bd74133bc21eac59b2e2bf97f2a30770a315"
}
}
"DevelopmentDependency": true
}
},
{
"Component": {
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/lldb-tools/lldb-mi",
"CommitHash": "2388bd74133bc21eac59b2e2bf97f2a30770a315"
}
],
"Version": 1
}
}
}
],
"Version": 1
}
13 changes: 9 additions & 4 deletions Extension/i18n/chs/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"c_cpp.command.BuildAndDebugFile.title": "调试 C/C++ 文件",
"c_cpp.command.BuildAndRunFile.title": "运行 C/C++ 文件",
"c_cpp.command.AddDebugConfiguration.title": "添加调试配置",
"c_cpp.command.GenerateDoxygenComment.title": "生成 Doxygen 注释",
"c_cpp.configuration.maxConcurrentThreads.markdownDescription": "用于语言服务处理的最大并发线程数。该值是一个提示,且不能始终使用。默认值 `null` (空)使用可用的逻辑处理器数。",
"c_cpp.configuration.maxCachedProcesses.markdownDescription": "用于语言服务处理的最大缓存进程数。默认值 `null` (空)使用可用逻辑处理器数的两倍。",
"c_cpp.configuration.maxMemory.markdownDescription": "可用于语言服务处理的最大内存(以 MB 为单位)。超过此内存使用量后,将缓存且并发运行较少的进程。默认值 `null` (空)使用系统的空闲内存。",
Expand All @@ -49,12 +50,13 @@
"c_cpp.configuration.codeAnalysis.excludeWhen.markdownDescription": "对匹配文件同辈进行其他检查。将 `$(basename)` 用作匹配文件名变量。",
"c_cpp.configuration.codeAnalysis.runAutomatically.markdownDescription": "如果为 `true`,则代码分析将在文件打开或保存后自动在文件上运行。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showDisable.markdownDescription": "如果为`true`,`禁用'代码操作将在可用时显示(下次运行代码分析时)。使用`禁用'代码操作时,它会将警告代码添加到 `C_Cpp.codeAnalysis.clangTidy.checks.disabled`设置。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showDocumentation.markdownDescription": "如果为`true`,“显示文档”代码操作将在可用时显示(下次运行代码分析时)。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showDocumentation.markdownDescription": "如果为 `true`,“显示文档”代码操作将在可用时显示(下次运行代码分析时)。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showClear.description": "控制哪些“清除”代码分析问题代码操作选项可用。更改设置以显示更多选项可能需要重新运行代码分析。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showClear.None.description": "不显示“清除”代码操作。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showClear.AllOnly.description": "仅显示“全部清除”代码操作(如果只有一种类型,则显示“清除所有<type>”,如果只有一个问题,则显示“清除此项”)。",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showClear.AllAndAllType.description": "如果存在多个问题类型,显示“全部清除”代码操作和“清除所有 <type>”代码操作(或如果<type>只有一个问题,显示“清除此项”)",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.showClear.AllAndAllTypeAndThis.description": "如果有多个问题类型,显示“全部清除”,如果有多个 <type> 问题,显示“清除所有 <type>”以及显示“清除此项”代码操作",
"c_cpp.configuration.codeAnalysis.clangTidy.codeAction.formatFixes.markdownDescription": "如果为 `true`,则在 `修复` 代码操作更改的行上运行格式设置。",
"c_cpp.configuration.codeAnalysis.clangTidy.enabled.markdownDescription": "如果为 `true`,则在 `#C_Cpp.codeAnalysis.runAutomatically#` 为 `true` (默认值)时,将启用并自动运行使用 `clang-tidy` 的代码分析。",
"c_cpp.configuration.codeAnalysis.clangTidy.path.markdownDescription": "`clang-tidy` 可执行文件的完整路径。如果未指定,并且 `clang-tidy` 在环境路径中可用,则使用该路径。如果在环境路径中找不到,则将使用与扩展捆绑的 `clang-tidy`。",
"c_cpp.configuration.codeAnalysis.clangTidy.config.markdownDescription": "指定 YAML/JSON 格式的 `clang-tidy` 配置: `{Checks: '-*,clang-analyzer-*', CheckOptions: [{键: x, 值: y}]}`。当值为空时,`clang-tidy` 将尝试为其父目录中的每个源文件查找名为 `.clang-tidy` 的文件。",
Expand Down Expand Up @@ -174,9 +176,9 @@
"c_cpp.configuration.inlayHints.autoDeclarationTypes.enabled.markdownDescription": "在声明中使用 `auto` 时显示推导类型的内嵌提示:\n```cpp \n\n auto index /* : int */ = 0;\n```",
"c_cpp.configuration.inlayHints.autoDeclarationTypes.showOnLeft.markdownDescription": "在标识符左侧声明中使用 `auto` 时显示推导类型的内嵌提示:\n```cpp \n\n auto /* int */ index = 0;\n```",
"c_cpp.configuration.inlayHints.parameterNames.enabled.markdownDescription": "显示参数名称的内嵌提示:\n```cpp \n\n int a = getArea(/* width: */ x, /* height: */ y);\n```",
"c_cpp.configuration.inlayHints.parameterNames.hideLeadingUnderscores.markdownDescription": "在参数名称提示中隐藏开头的`_`。",
"c_cpp.configuration.inlayHints.parameterNames.suppressWhenArgumentContainsName.markdownDescription": "当参数文本或内联注释包含参数名称时,隐藏参数名称提示:\n```cpp \n\n int a = getArea(width, /* height: */ y);\n```",
"c_cpp.configuration.inlayHints.referenceOperator.enabled.markdownDescription": "显示非 const 引用传递的参数的内嵌提示引用运算符 `&`:\n```cpp \n\n swap(/* &first: */ str1, /* &last: */ str2);\n```",
"c_cpp.configuration.inlayHints.parameterNames.hideLeadingUnderscores.markdownDescription": "在参数名称提示中隐藏开头的 `_`。",
"c_cpp.configuration.inlayHints.parameterNames.suppressWhenArgumentContainsName.markdownDescription": "当参数文本或内联注释包含参数名称时,抑制参数名称提示:\n```cpp \n\n int a = getArea(width, /* height: */ y);\n```",
"c_cpp.configuration.inlayHints.referenceOperator.enabled.markdownDescription": "显示非常量引用传递的参数的内嵌提示引用运算符 `&`:\n```cpp \n\n swap(/* &first: */ str1, /* &last: */ str2);\n```",
"c_cpp.configuration.inlayHints.referenceOperator.showSpace.markdownDescription": "控制在 `&` 后是否显示非常量引用传递的参数的空格:\n```cpp \n\n swap(/* & first: */ str1, /* & last: */ str2);\n```",
"c_cpp.configuration.loggingLevel.markdownDescription": "输出面板中日志记录的详细程度。从最不详细到最详细的级别顺序为: `None` < `Error` < `Warning` < `Information` < `Debug`。",
"c_cpp.configuration.autoAddFileAssociations.markdownDescription": "控制当文件为 C/C++ 文件中导航操作的目标时,其是否自动添加到 `#files.associations#`。",
Expand All @@ -187,6 +189,8 @@
"c_cpp.configuration.exclusionPolicy.checkFilesAndFolders.description": "将针对每个遇到的文件和文件夹评估排除筛选器。",
"c_cpp.configuration.preferredPathSeparator.markdownDescription": "用作 `#include` 自动完成结果的路径分隔符的字符。",
"c_cpp.configuration.simplifyStructuredComments.markdownDescription": "如果为 `true`,则悬停和自动完成的工具提示将仅显示结构化注释的某些标签。否则,将显示所有注释。",
"c_cpp.configuration.doxygen.generateOnType.description": "控制在键入所选注释样式后是否自动插入 Doxygen 注释。",
"c_cpp.configuration.doxygen.generatedStyle.description": "用作 Doxygen 注释起始行的字符串。",
"c_cpp.configuration.commentContinuationPatterns.items.anyof.string.markdownDescription": "开始多行或单行注释块的模式。多行注释块的延续模式默认为 ` * `,或单行注释块默认为此字符串。",
"c_cpp.configuration.commentContinuationPatterns.items.anyof.object.begin.description": "开启一个多行或单行注释块的模式。",
"c_cpp.configuration.commentContinuationPatterns.items.anyof.object.continue.description": "在多行或单行注释块内按下 Enter 键时要插入到下一行的文本。",
Expand Down Expand Up @@ -277,6 +281,7 @@
"c_cpp.debuggers.miDebuggerPath.description": "MI 调试程序(如 gdb)的路径。如果未指定,将首先在路径中搜索调试程序。",
"c_cpp.debuggers.miDebuggerArgs.description": "MI 调试程序(如 gdb)的其他参数。",
"c_cpp.debuggers.miDebuggerServerAddress.description": "要连接到的 MI 调试程序服务器的网络地址(示例: localhost:1234)。",
"c_cpp.debuggers.useExtendedRemote.description": "使用目标扩展远程模式连接到 MI 调试器服务器。",
"c_cpp.debuggers.stopAtEntry.description": "可选参数。如果为 true,则调试程序应在目标的入口点处停止。如果传递了 processId,则不起任何作用。",
"c_cpp.debuggers.debugServerPath.description": "到要启动的调试服务器的可选完整路径。默认值为 null。该路径与 “miDebugServerAddress” 或带有运行 “-target-select remote <server:port>” 的 “customSetupCommand” 的自有服务器配合使用。",
"c_cpp.debuggers.debugServerArgs.description": "可选调试服务器参数。默认为 null。",
Expand Down
7 changes: 5 additions & 2 deletions Extension/i18n/chs/src/Debugger/attachToProcess.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
"no.pipetransport": "所选的调试配置不包含 {0}",
"debugger.path.and.server.address.required": "调试配置中的 {0} 需要 {1} 和 {2}",
"no.pipetransport.useextendedremote": "所选的调试配置不包含 {0} 或 {1}",
"select.process.attach": "选择要附加到的进程",
"process.not.selected": "未选择进程。",
"pipe.failed": "管道传输未能获取 OS 和进程。",
"no.process.list": "传输附加无法获取进程列表。"
"no.process.list": "传输附加无法获取进程列表。",
"failed.to.make.gdb.connection": "无法建立 GDB 连接:“{0}”。",
"failed.to.parse.processes": "无法分析进程:“{0}”。"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"lldb.framework.not.found": "找不到用于 lldb-mi 的 \"LLDB.framework\"。请安装 XCode 或 XCode 命令行工具。",
"debugger.launchConfig": "启动配置:",
"vs.code.1.69+.required": "\"deploySteps\" 需要 VS Code 1.69+。",
"running.deploy.steps": "正在运行部署步骤...",
"pre.Launch.Task": "preLaunchTask: {0}",
"build.and.debug.active.file": "生成和调试活动文件",
"cl.exe.not.available": "仅当从 VS 开发人员命令提示符处运行 VS Code 时,{0} 生成和调试才可用。",
Expand Down
1 change: 1 addition & 0 deletions Extension/i18n/chs/src/LanguageServer/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{
"learn.how.to.install.a.library": "了解如何使用 vcpkg 为此标头安装库",
"copy.vcpkg.command": "将用于安装“{0}”的 vcpkg 命令复制到剪贴板",
"on.disabled.command": "当 `C_Cpp.intelliSenseEngine` 设置为 `Disabled` 时,无法执行与 IntelliSense 相关的命令。",
"client.not.found": "未找到客户端",
"configuration.select.first": "首先打开一个文件夹以选择配置",
"configuration.provider.select.first": "首先打开一个文件夹以选择配置提供程序",
Expand Down
3 changes: 2 additions & 1 deletion Extension/i18n/chs/src/nativeStrings.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,6 @@
"folder_tag": "文件夹",
"file_tag": "文件",
"compiler_default_language_standard_version_old": "编译器返回默认语言标准版本:{0}。由于此版本是旧版本,因此将尝试使用较新版本 {1} 作为默认版本。",
"unexpected_output_from_clang_tidy": "来自 clang-tidy 的意外输出:{0}。应为:{1}。"
"unexpected_output_from_clang_tidy": "来自 clang-tidy 的意外输出:{0}。应为:{1}。",
"generate_doxygen_comment": "生成 Doxygen 注释"
}
Loading

0 comments on commit c2fdf75

Please sign in to comment.