Merge pull request #11633 from microsoft/main

Merge for 1.18.2

Author: sean-mcmanus

Extension/CHANGELOG.md

@@ -1,5 +1,12 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.18.2: November 7, 2023
+### Bug Fixes
+* Fix an IntelliSense crash when hovering over an invalid array index expression. [#11510](https://github.com/microsoft/vscode-cpptools/issues/11510)
+* Fix 'Add #include' code actions not appearing for "is not a template" errors. [#11543](https://github.com/microsoft/vscode-cpptools/issues/11543)
+* Fix 'Extract to function' bugs with formatting and selection. [#11614](https://github.com/microsoft/vscode-cpptools/issues/11614), [#11619](https://github.com/microsoft/vscode-cpptools/issues/11619)
+* Fix 'Add #include' code actions being available for system headers that are already included. [#11618](https://github.com/microsoft/vscode-cpptools/issues/11618)
+
 ## Version 1.18.1: November 2, 2023
 ### New Feature
 * Add `#include` code action suggestions for some IntelliSense errors related to symbols not being found. [#10791](https://github.com/microsoft/vscode-cpptools/issues/10791)

Extension/i18n/chs/package.i18n.json

@@ -16,8 +16,8 @@
 	"c_cpp.command.configurationProviderSelect.title": "更改配置提供程序...",
 	"c_cpp.command.configurationEditJSON.title": "编辑配置(JSON)",
 	"c_cpp.command.configurationEditUI.title": "编辑配置(UI)",
-	"c_cpp.command.selectDefaultCompiler.title": "选择默认编译器...",
 	"c_cpp.command.selectIntelliSenseConfiguration.title": "选择 IntelliSense 配置...",
+	"c_cpp.command.installCompiler.title": "安装 C++ 编译器",
 	"c_cpp.command.rescanCompilers.title": "重新扫描编译器",
 	"c_cpp.command.switchHeaderSource.title": "切换标头/源",
 	"c_cpp.command.enableErrorSquiggles.title": "启用错误波形曲线",
@@ -416,8 +416,9 @@
 	"c_cpp.walkthrough.description": "深入了解 VS Code 丰富的 C++ 开发体验。",
 	"c_cpp.walkthrough.set.up.title": "设置 C++ 环境",
 	"c_cpp.walkthrough.activating.description": "激活 C++ 扩展以确定是否已设置 C++ 环境。\n正在激活扩展...",
-	"c_cpp.walkthrough.no.compilers.description": "无法在计算机上找到 C++ 编译器，这是使用 C++ 扩展所必需的。请按照右侧的说明安装一个编译器，然后单击下面的“查找我的新编译器”。\n[查找我的新编译器](command:C_Cpp.RescanCompilers?%7B%22sender%22%3A%22walkthrough%22%7D)",
-	"c_cpp.walkthrough.compilers.found.description": "C++ 扩展需要与 C++ 编译器一起使用。通过单击下面的按钮从计算机上已有的编译器中选择一个。\n[选择我的默认编译器](command:C_Cpp.SelectDefaultCompiler?%7B%22sender%22%3A%22walkthrough%22%7D)",
+	"c_cpp.walkthrough.no.compilers.windows.description": "无法在计算机上找到 C++ 编译器，这是使用 C++ 扩展所必需的。请按照右侧的说明安装一个编译器，然后单击下面的“查找我的新编译器”。\n[查找我的新编译器](command:C_Cpp.RescanCompilers?%22walkthrough%22)",
+	"c_cpp.walkthrough.no.compilers.description": "在你的计算机上找不到 C++ 编译器，而使用 C++ 扩展需要该编译器。请选择“安装 C++ 编译器”，为你安装编译器，或者按照右侧的说明安装编译器，然后单击下面的“查找我的新编译器”。\n[安装 C++ 编译器](command:C_Cpp.InstallCompiler?%22walkthrough%22)\n[查找我的新编译器](command:C_Cpp.RescanCompilers?%22walkthrough%22)",
+	"c_cpp.walkthrough.compilers.found.description": "C++ 扩展需要与 C++ 编译器一起使用。通过点击下面的按钮从机器上已有的编译器中选择一个。\n[选择我的默认编译器](command:C_Cpp.SelectIntelliSenseConfiguration?%22walkthrough%22)",
 	"c_cpp.walkthrough.compilers.found.altText": "显示在用户计算机上找到的选定默认编译器快捷检查和编译器列表的图像，其中一个已选定。",
 	"c_cpp.walkthrough.create.cpp.file.title": "创建 C++ 文件",
 	"c_cpp.walkthrough.create.cpp.file.description": "[打开](command:toSide:workbench.action.files.openFile)或[创建](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22cpp%22%7D)一个 C++ 文件。请确保将其保存为 \".cpp\" 扩展名，例如 \"helloworld.cpp\"。\n[创建 C++ 文件](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22cpp%22%7D)",
@@ -430,8 +431,16 @@
 	"c_cpp.walkthrough.run.debug.windows.description": "打开你的 C++ 文件，然后在编辑器右上角点击播放按钮，或者当你在该文件上时按下 F5。选择“cl.exe - 构建和调试活动文件”以使用调试器运行。",
 	"c_cpp.walkthrough.run.debug.windows.altText": "显示 C++ 文件中的断点、f5 按钮和右上角的运行符号的图像",
 	"c_cpp.walkthrough.customize.debugging.title": "自定义调试",
-	"c_cpp.walkthrough.customize.debugging.mac.description": "可以通过在播放按钮右侧选择“添加调试配置”来自定义调试配置(例如，在运行时传递参数给程序)。自定义调试配置将保存在项目的 launch.json 文件中。\n[了解更多](https://code.visualstudio.com/docs/cpp/config-linux#_debug-helloworldcpp)",
-	"c_cpp.walkthrough.customize.debugging.linux.description": "可以通过在播放按钮右侧选择“添加调试配置”来自定义调试配置(例如，在运行时传递参数给程序)。自定义调试配置将保存在项目的 launch.json 文件中。\n[了解更多](https://code.visualstudio.com/docs/cpp/config-msvc#_debug-helloworldcpp)",
-	"c_cpp.walkthrough.customize.debugging.windows.description": "可以通过在播放按钮右侧选择“添加调试配置”来自定义调试配置(例如，在运行时传递参数给程序)。自定义的调试配置将保存在项目的 launch.json 文件中。\n[了解更多](https://code.visualstudio.com/docs/cpp/config-clang-mac#_debug-helloworldcpp)",
-	"c_cpp.walkthrough.customize.debugging.altText": "显示下拉列表中“添加调试配置”的图像"
+	"c_cpp.walkthrough.customize.debugging.mac.description": "若要自定义调试配置，请在活动栏中选择“资源管理器”，然后打开包含 C++ 文件的文件夹。打开 C++ 文件，然后选择播放按钮右侧的“添加调试配置”。新的调试配置将保存到项目的 launch.json 文件中。\n[了解详细信息](https://code.visualstudio.com/docs/cpp/config-linux#_debug-helloworldcpp)",
+	"c_cpp.walkthrough.customize.debugging.linux.description": "若要自定义调试配置，请在活动栏中选择“资源管理器”，然后打开包含 C++ 文件的文件夹。打开 C++ 文件，然后选择播放按钮右侧的“添加调试配置”。新的调试配置将保存到项目的 launch.json 文件中。\n[了解详细信息](https://code.visualstudio.com/docs/cpp/config-msvc#_debug-helloworldcpp)",
+	"c_cpp.walkthrough.customize.debugging.windows.description": "若要自定义调试配置，请在活动栏中选择“资源管理器”，然后打开包含 C++ 文件的文件夹。打开 C++ 文件，然后选择播放按钮右侧的“添加调试配置”。新的调试配置将保存到项目的 launch.json 文件中。\n[了解详细信息](https://code.visualstudio.com/docs/cpp/config-clang-mac#_debug-helloworldcpp)",
+	"c_cpp.walkthrough.customize.debugging.altText": "显示下拉列表中“添加调试配置”的图像",
+	"c_cpp.codeActions.refactor.inline.macro.title": "内联宏",
+	"c_cpp.codeActions.refactor.inline.macro.description": "将宏调用替换为展开的代码。",
+	"c_cpp.codeActions.refactor.extract.function.title": "提取到函数",
+	"c_cpp.codeActions.refactor.extract.function.description": "将所选代码提取到自由函数或成员函数。",
+	"c_cpp.configuration.refactoring.includeHeader.markdownDescription": "控制在执行重构操作(例如创建声明/定义)时是否将已重构的函数/符号的头文件包含在其相应的源文件。",
+	"c_cpp.configuration.refactoring.includeHeader.always.description": "如果头文件未显式包含在源文件中，则始终包含该头文件。",
+	"c_cpp.configuration.refactoring.includeHeader.ifNeeded.description": "仅当头文件未显式包含在源文件中或通过隐式包含来包含在内时，才包含该头文件。",
+	"c_cpp.configuration.refactoring.includeHeader.never.description": "从不包含头文件。"
 }

Extension/i18n/chs/src/Debugger/ParsedEnvironmentFile.i18n.json

@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"ignoring.lines.in.envfile": "忽略 {0} {1} 中不可分析的行:"
+	"ignoring.lines.in.envfile": "忽略 {0} {1} 中不可分析的行: "
 }

Extension/i18n/chs/src/Debugger/extension.i18n.json

@@ -14,5 +14,5 @@
 	"select.ssh.config.file": "选择 SSH 配置文件",
 	"yes": "是",
 	"no": "否",
-	"ssh.target.delete.confirmation": "是否确实要永久删除“{0}”?"
+	"ssh.target.delete.confirmation": "是否确定要永久删除“{0}”?"
 }

Extension/i18n/chs/src/LanguageServer/Providers/codeActionProvider.i18n.json

@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"expands.to": "扩展到:",
+	"inline.macro": "内联宏",
+	"inline.macro.not.available": "内联宏在此位置不可用。"
+}

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

@@ -11,44 +11,29 @@
 	"use.compiler": "使用 {0}",
 	"configuration.providers": "配置提供程序",
 	"compilers": "编译器",
-	"setCompiler.message": "未配置编译器。除非设置自己的配置，否则 IntelliSense 可能无法正常工作。",
-	"selectIntelliSenseConfiguration.string": "选择 IntelliSense 配置...",
 	"use.provider": "使用 {0}",
 	"use.compileCommands": "使用 {0}",
 	"selectAnotherCompiler.string": "在我的计算机上选择另一个编译器...",
 	"installCompiler.string": "帮助我安装编译器",
+	"installCompiler.string.nix": "安装编译器",
 	"noConfig.string": "请勿适用编译器进行配置(不推荐)",
-	"selectCompiler.string": "选择编译器",
-	"confirmCompiler.string": "是",
-	"selectCompiler.message": "已找到编译器 {0}。是否要使用此编译器配置 IntelliSense?",
 	"check.permissions": "EPERM: 检查“{0}”的权限",
 	"unable.to.start": "无法启动 C/C++ 语言服务器。IntelliSense 功能将被禁用。错误: {0}",
 	"server.crashed.restart": "语言服务器崩溃。正在重新启动...",
 	"server.crashed2": "在过去 3 分钟内，语言服务器崩溃了 5 次。它不会重新启动。",
 	"loggingLevel.changed": "{0} 已更改为: {1}",
 	"dismiss.button": "消除",
-	"diable.warnings.button": "禁用警告",
+	"disable.warnings.button": "禁用警告",
 	"unable.to.provide.configuration": "{0} 无法为“{1}”提供 IntelliSense 配置信息。将改为使用“{2}”配置中的设置。",
 	"config.not.found": "找不到请求的配置名称: {0}",
 	"unsupported.client": "不支持的客户端",
 	"timed.out": "将在 {0} 毫秒后超时。",
 	"update.intellisense.time": "更新 IntelliSense 时间(秒): {0}",
-	"configure.json.button": "配置(JSON)",
-	"configure.ui.button": "配置(UI)",
-	"dont.show.again": "不再显示",
-	"update.your.intellisense.settings": "更新 IntelliSense 设置或使用 Vcpkg 来安装用于帮助查找缺少的标头的库。",
-	"configure.your.intellisense.settings": "配置 IntelliSense 设置以帮助查找缺少的标头。",
-	"provider.configure.folder": "{0} 想要为“{1}”文件夹配置 IntelliSense。",
-	"provider.configure.this.folder": "{0} 想要为此文件夹配置 IntelliSense。",
-	"allow.button": "允许",
-	"dont.allow.button": "不允许",
-	"ask.me.later.button": "稍后询问我",
-	"a.compile.commands.file": "compile_commands.json 文件",
-	"auto-configure.intellisense.folder": "是否要使用 {0} 为“{1}”文件夹自动配置 IntelliSense?",
-	"auto-configure.intellisense.this.folder": "是否要使用 {0} 为此文件夹自动配置 IntelliSense?",
-	"yes.button": "是",
-	"no.button": "否",
 	"configurations.received": "已收到自定义配置:",
 	"browse.configuration.received": "已收到自定义浏览配置: {0}",
-	"fallback.clipboard": "已复制声明/定义。"
+	"fallback.clipboard": "已复制声明/定义。",
+	"handle.extract.name": "为提取的函数命名",
+	"handle.extract.new.function": "NewFunction",
+	"handle.extract.error": "未能提取到函数: {0}",
+	"invalid.edit": "未能提取到函数。生成了无效的编辑:“{0}”"
 }

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

@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"fix_all_code_analysis_problems": "修复所有代码分析问题",
-	"clear_all_code_analysis_problems": "清除所有代码分析问题",
-	"fix_all_type_problems": "修复所有 {0} 问题",
-	"disable_all_type_problems": "禁用所有 {0} 问题",
-	"clear_all_type_problems": "清除所有{0}问题",
-	"clear_this_problem": "清除此 {0} 问题",
-	"fix_this_problem": "修复此 {0} 问题",
-	"show_documentation_for": "显示 {0} 文档"
+	"fix.all.code.analysis.problems": "修复所有代码分析问题",
+	"clear.all.code.analysis.problems": "清除所有代码分析问题",
+	"fix.all.type.problems": "修复所有 {0} 问题",
+	"disable.all.type.problems": "禁用所有 {0} 问题",
+	"clear.all.type.problems": "清除所有{0}问题",
+	"clear.this.problem": "清除此 {0} 问题",
+	"fix.this.problem": "修复此 {0} 问题",
+	"show.documentation.for": "显示 {0} 文档"
 }

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

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"build_active_file": "生成活动文件",
-	"compiler_details": "编译器:",
-	"task_generated_by_debugger": "调试器生成的任务。",
+	"build.active.file": "生成活动文件",
+	"compiler.details": "编译器:",
+	"task.generated.by.debugger": "调试器生成的任务。",
 	"cannot.build.non.cpp": "无法生成和调试，因为活动文件不是 C 或 C++ 源文件。",
-	"starting_build": "正在启动生成...",
+	"starting.build": "正在启动生成...",
 	"build.run.terminated": "生成运行已终止。",
 	"build.finished.with.error": "生成已完成，但出现错误。",
 	"build.finished.with.warnings": "生成已完成，但收到警告。",

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

@@ -8,8 +8,16 @@
 	"copy.vcpkg.command": "将用于安装“{0}”的 vcpkg 命令复制到剪贴板",
 	"on.disabled.command": "当 `C_Cpp.intelliSenseEngine` 设置为 `disabled` 时，无法执行与 IntelliSense 相关的命令。",
 	"client.not.found": "未找到客户端",
+	"ok": "确定",
+	"install.compiler.mac.title": "现在将安装 clang 编译器",
+	"install.compiler.mac.detail": "系统可能会提示你在 VS Code 终端窗口中键入密码以授权安装。",
+	"install.compiler.linux.title": "现在将安装 gcc 编译器",
+	"install.compiler.linux.detail": "系统可能会提示你在 VS Code 终端窗口中键入密码以授权安装。",
 	"configuration.select.first": "首先打开一个文件夹以选择配置。",
 	"configuration.provider.select.first": "首先打开一个文件夹以选择配置提供程序。",
 	"edit.configurations.open.first": "首先打开一个文件夹以编辑配置",
-	"code.action.aborted": "无法应用代码分析修复程序，因为文档已更改。"
+	"code.action.aborted": "无法应用代码分析修复程序，因为文档已更改。",
+	"prerelease.message": "C/C++ 扩展的预发行版本可用。是否要切换到它?",
+	"yes.button": "是",
+	"no.button": "否"
 }

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

@@ -4,58 +4,53 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"updating.intellisense.text": "IntelliSense: 正在更新",
+	"idle.intellisense.text": "IntelliSense: 就绪",
+	"initializing.tagparser.text": "正在初始化工作区",
+	"indexing.tagparser.text": "正在索引工作区",
 	"running.tagparser.text": "分析工作区",
 	"paused.tagparser.text": "分析工作区: 已暂停",
 	"complete.tagparser.text": "分析完毕",
-	"initializing.tagparser.text": "正在初始化工作区",
-	"indexing.tagparser.text": "正在索引工作区",
 	"rescan.tagparse.text": "重新扫描工作区",
 	"c.cpp.parsing.open.files.tooltip": "正在分析打开的文件",
-	"click.to.preview": "单击以预览结果",
-	"updating.intellisense.text": "IntelliSense: 正在更新",
-	"idle.intellisense.text": "IntelliSense: 就绪",
-	"absent.intellisense.text": "IntelliSense: 未配置",
 	"running.analysis.text": "Code Analysis: 正在运行",
 	"paused.analysis.text": "Code Analysis: 已暂停",
 	"mode.analysis.prefix": "Code Analysis 模式:",
+	"click.to.preview": "单击以预览结果",
 	"c.cpp.configureIntelliSenseStatus.text": "配置 IntelliSense",
-	"c.cpp.configureIntelliSenseStatus.cppText": "C/C++ 配置 IntelliSense",
-	"c.cpp.configuration.tooltip": "C/C++ 配置",
-	"c.cpp.references.statusbar": "C/C++ 引用状态",
 	"cpptools.status.intellisense": "C/C++ IntelliSense 状态",
+	"rescan.intellisense.text": "重新扫描",
+	"rescan.intellisense.tooltip": "重新扫描 IntelliSense",
 	"cpptools.status.tagparser": "C/C++ 标记分析器状态",
 	"cpptools.detail.tagparser": "正在初始化...",
+	"tagparser.resume.text": "继续",
+	"tagparser.pause.text": "暂停",
 	"cpptools.status.codeanalysis": "C/C++ Code Analysis 状态",
 	"c.cpp.codeanalysis.statusbar.runNow": "立即运行",
-	"tagparser.pause.text": "暂停",
-	"tagparser.resume.text": "继续",
-	"intellisense.select.text": "选择编译器",
-	"rescan.intellisense.text": "重新扫描",
-	"rescan.intellisense.tooltip": "重新扫描 IntelliSense",
 	"mode.codeanalysis.status.automatic": "自动",
 	"mode.codeanalysis.status.manual": "手动",
 	"c.cpp.codeanalysis.statusbar.showCodeAnalysisOptions": "选项",
 	"startup.codeanalysis.status": "正在启动...",
 	"c.cpp.codeanalysis.statusbar.showRunNowOptions": "立即运行",
 	"running.analysis.processed.tooltip": "正在运行: {0}/{1} ({2}%)",
-	"select.a.configuration": "选择配置...",
-	"edit.configuration.ui": "编辑配置(UI)",
-	"edit.configuration.json": "编辑配置(JSON)",
-	"select.configuration.provider": "选择配置提供程序...",
-	"active": "活动",
-	"none": "无",
-	"disable.configuration.provider": "禁用活动配置提供程序(如果适用)。",
-	"select.compile.commands": "选择 compile_commands.json...",
-	"select.workspace": "选择工作区文件夹…",
-	"select.command": "选择命令...",
 	"select.code.analysis.command": "选择代码分析命令...",
-	"resume.parsing": "恢复工作区分析",
-	"pause.parsing": "暂停工作区分析",
 	"cancel.analysis": "取消",
 	"resume.analysis": "继续",
 	"pause.analysis": "暂停",
 	"another.analysis": "启动另一个...",
+	"select.command": "选择命令...",
 	"active.analysis": "在活动文件上运行 Code Analysis",
 	"all.analysis": "在所有文件上运行 Code Analysis",
-	"open.analysis": "在打开的文件上运行 Code Analysis"
+	"open.analysis": "在打开的文件上运行 Code Analysis",
+	"c.cpp.references.statusbar": "C/C++ 引用状态",
+	"c.cpp.configuration.tooltip": "C/C++ 配置",
+	"c.cpp.configureIntelliSenseStatus.cppText": "C/C++ 配置 IntelliSense",
+	"select.a.configuration": "选择配置...",
+	"edit.configuration.ui": "编辑配置(UI)",
+	"edit.configuration.json": "编辑配置(JSON)",
+	"select.configuration.provider": "选择配置提供程序...",
+	"active": "活动",
+	"none": "无",
+	"disable.configuration.provider": "禁用活动配置提供程序(如果适用)。",
+	"select.workspace": "选择工作区文件夹…"
 }