Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit32c1d6b

Browse files
authored
Merge pull requestmicrosoft#6997 from microsoft/main
Merge for 1.2.2-insiders2
2 parentsebd5314 +2199ec3 commit32c1d6b

File tree

15 files changed

+31
-16
lines changed

15 files changed

+31
-16
lines changed

‎Extension/.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"request":"launch",
9999
"runtimeExecutable":"${execPath}",
100100
"args": [
101-
"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject",
101+
"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject/simpleCppProject.code-workspace",
102102
"--extensionDevelopmentPath=${workspaceFolder}",
103103
"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/languageServer/index"
104104
],

‎Extension/CHANGELOG.md‎

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

3+
##Version 1.2.2-insiders2: February 18, 2021
4+
###Bug Fixes
5+
* Fix an extension activation failure when a non-existent folder exists in the workspace.[#6981](https://github.com/microsoft/vscode-cpptools/issues/6981)
6+
* Fix a regression with handling of -isysroot/--sysroot compiler arguments.[#6992](https://github.com/microsoft/vscode-cpptools/issues/6992)
7+
38
##Version 1.2.2-insiders: February 17, 2021
49
###Bug Fixes
510
* Fix for random IntelliSense communication failures on Mac. Potentially fixes:[#6809](https://github.com/microsoft/vscode-cpptools/issues/6809),[#6958](https://github.com/microsoft/vscode-cpptools/issues/6958)

‎Extension/i18n/chs/c_cpp_properties.schema.json.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"c_cpp_properties.schema.json.definitions.configurations.items.properties.macFrameworkPath":"Intellisense 引擎在 Mac 框架中搜索包含的标头时要使用的路径的列表。仅在 Mac 配置中受支持。",
1515
"c_cpp_properties.schema.json.definitions.configurations.items.properties.windowsSdkVersion":"要在 Windows 上使用的 Windows SDK 包含路径的版本，例如\"10.0.17134.0\"。",
1616
"c_cpp_properties.schema.json.definitions.configurations.items.properties.defines":"分析文件时 IntelliSense 引擎要使用的预处理器定义的列表。(可选)使用 = 设置值，例如 VERSION=1。",
17-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode":"The IntelliSensemode to use that maps to a platform and architecture variant ofMSVC,gcc, or Clang. If not set or if set to${default}, the extension will choose the default for that platform.Windowsdefaults towindows-msvc-x64,Linuxdefaults tolinux-gcc-x64, andmacOSdefaults tomacos-clang-x64. IntelliSense modes that only specify<compiler>-<architecture>variants (e.g. gcc-x64) are legacy modes and are converted automatically to the<platform>-<compiler>-<architecture>variants based on the host platform.",
17+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode":"要使用的 IntelliSense模式，该模式映射到MSVC、gcc 或 Clang 的平台和体系结构变体。如果未设置或设置为${default}，则扩展将选择该平台的默认值。Windows默认为windows-msvc-x64，Linux默认为linux-gcc-x64，macOS默认为macos-clang-x64。仅指定<compiler>-<architecture>变体(例如 gcc-x64)的 IntelliSense 模式是旧模式，它们会根据主机平台自动转换为<platform>-<compiler>-<architecture>变体。",
1818
"c_cpp_properties.schema.json.definitions.configurations.items.properties.forcedInclude":"应在翻译单元中包括在任何包含文件之前的文件的列表。",
1919
"c_cpp_properties.schema.json.definitions.configurations.items.properties.configurationProvider":"可为源文件提供 IntelliSense 配置信息的 VS Code 扩展的 ID。",
2020
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.limitSymbolsToIncludedHeaders":"如果为 true，则仅处理以标头形式直接或间接包含的文件；如果为 false，则处理指定的包含路径下的所有文件。",

‎Extension/i18n/chs/package.i18n.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
"c_cpp.configuration.vcFormat.wrap.preserveBlocks.allOneLineScopes.description":"无论任何“VC 格式: 新行”设置的值如何，在同一行输入左大括号和右大括号的任何代码都保留在同一行上",
115115
"c_cpp.configuration.vcFormat.wrap.preserveBlocks.never.description":"始终根据“VC 格式: 新行”设置来设定代码块的格式",
116116
"c_cpp.configuration.clang_format_path.description":"clang-format 可执行文件的完整路径。如果未指定，并且 Clang 格式在环境路径中可用，则使用 Clang 格式。如果在环境路径中找不到 Clang 格式，则将使用与该扩展绑定的 clang-format 的副本。",
117-
"c_cpp.configuration.clang_format_style.description":"Coding style, currently supports: Visual Studio,LLVM,Google,Chromium,Mozilla,WebKit. Use\"file\"to load the style from a.clang-format file in the current or parent directory. Use {key: value, ...}to set specific parameters. For example, the\"Visual Studio\"style is similar to: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
118-
"c_cpp.configuration.clang_format_fallbackStyle.description":"Name of the predefined style used as a fallback in case clang-format is invoked with style\"file\"but the .clang-format file is not found. Possible values areVisual Studio,LLVM,Google,Chromium,Mozilla,WebKit,none, or use{key: value, ...}to set specific parameters. For example, the\"Visual Studio\"style is similar to: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
117+
"c_cpp.configuration.clang_format_style.description":"编码样式，当前支持: Visual Studio、LLVM、Google、Chromium、Mozilla、WebKit。使用\"file\"从当前目录或父目录中的.clang 格式文件中加载样式。使用 {键: 值, ...}设置特定参数。例如，\"Visual Studio\"样式类似于: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
118+
"c_cpp.configuration.clang_format_fallbackStyle.description":"如果使用样式\"file\"调用clang 格式但是找不到 .clang 格式文件，则使用预定义的样式的名称作为回退。可能的值为Visual Studio、LLVM、Google、Chromium、Mozilla、WebKit、none，或使用{key: value, ...}设置特定参数。例如，\"Visual Studio\"样式类似于: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
119119
"c_cpp.configuration.clang_format_sortIncludes.description":"如果已设置，则重写由 SortIncludes 参数确定的包含排序行为。",
120120
"c_cpp.configuration.intelliSenseEngine.description":"控制 IntelliSense 提供程序。“标记分析器”提供非上下文感知的“模糊”结果。“默认”提供上下文感知结果。“已禁用”将关闭 C/C++ 语言服务功能。",
121121
"c_cpp.configuration.intelliSenseEngineFallback.description":"控制 IntelliSense 引擎是否自动切换到包含 #include 错误的翻译单元的标记分析器。",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"compiler.arguments":"用于修改所使用的包含或定义的编译器参数，例如 {0}、{1} 等。",
3131
"one.argument.per.line":"每行一个参数。",
3232
"intellisense.mode":"IntelliSense 模式",
33-
"intellisense.mode.description":"The IntelliSensemode to use that maps to a platform and architecture variant ofMSVC,gcc, or Clang. If not set or if set to{0}, the extension will choose the default for that platform.Windowsdefaults to{1},Linuxdefaults to{2}, andmacOSdefaults to{3}. Select a specificIntelliSensemode to override the{4}mode. IntelliSense modes that only specify{5}variants (e.g. {6}) are legacy modes and are converted automatically to the{7}variants based on the host platform.",
33+
"intellisense.mode.description":"要使用的 IntelliSense模式，该模式映射到MSVC、gcc 或 Clang 的平台和体系结构变体。如果未设置或设置为{0}，则扩展将选择该平台的默认值。Windows默认为{1}，Linux默认为{2}，macOS默认为{3}。选择特定IntelliSense模式以替代{4}模式。仅指定{5}变体(例如 {6})的 IntelliSense 模式是旧模式，它们会根据主机平台自动转换为{7}变体。",
3434
"include.path":"包含路径",
3535
"include.path.description":"include 路径是包括源文件中随附的头文件(如 {0})的文件夹。指定 IntelliSense 引擎在搜索包含的头文件时要使用的列表路径。对这些路径进行的搜索不是递归搜索。指定 {1} 可指示递归搜索。例如，{2} 将搜索所有子目录，而 {3} 则不会。如果在安装了 Visual Studio 的 Windows 上，或者在 {4} 设置中指定了编译器，则无需在此列表中列出系统 include 路径。",
3636
"one.include.path.per.line":"每行一个包含路径。",

‎Extension/i18n/cht/c_cpp_properties.schema.json.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"c_cpp_properties.schema.json.definitions.configurations.items.properties.macFrameworkPath":"供 Intellisense 引擎在 Mac 架構中搜尋包含的標頭時使用的路徑清單。僅支援用於 Mac 組態。",
1515
"c_cpp_properties.schema.json.definitions.configurations.items.properties.windowsSdkVersion":"要在 Windows 上使用的 Windows SDK 包含路徑版本，例如 '10.0.17134.0'。",
1616
"c_cpp_properties.schema.json.definitions.configurations.items.properties.defines":"剖析檔案時，IntelliSense 引擎要使用的前置處理器定義清單。您可使用 = 來設定值，例如 VERSION=1。",
17-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode":"The IntelliSensemode to use that maps to a platform and architecture variant ofMSVC,gcc, or Clang. If not set or if set to${default}, the extension will choose the default for that platform.Windowsdefaults towindows-msvc-x64,Linuxdefaults tolinux-gcc-x64, andmacOSdefaults tomacos-clang-x64. IntelliSense modes that only specify<compiler>-<architecture>variants (e.g. gcc-x64)are legacy modes and are converted automatically to the<platform>-<compiler>-<architecture>variants based on the host platform.",
17+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode":"要使用的 IntelliSense模式 (對應到MSVC、gcc 或 Clang 的平台及架構變體)。如果未設定或設為${default}，延伸模組會選擇該平台的預設。Windows預設為windows-msvc-x64、Linux預設為linux-gcc-x64、macOS預設為macos-clang-x64。僅指定<compiler>-<architecture>變體 (例如 gcc-x64)的 IntelliSense 模式即為舊版模式，會依據主機平台自動轉換為<platform>-<compiler>-<architecture>變體。",
1818
"c_cpp_properties.schema.json.definitions.configurations.items.properties.forcedInclude":"應包含在編譯單位中任何 include 檔案之前的檔案清單。",
1919
"c_cpp_properties.schema.json.definitions.configurations.items.properties.configurationProvider":"提供原始程式檔 IntelliSense 組態資訊的 VS Code 延伸模組識別碼。",
2020
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.limitSymbolsToIncludedHeaders":"設為 true，就會只處理直接或間接以標頭形式包含的檔案; 設為 false，則會處理位於指定 include 路徑下的所有檔案。",

‎Extension/i18n/cht/package.i18n.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
"c_cpp.configuration.vcFormat.wrap.preserveBlocks.allOneLineScopes.description":"在一行中所輸入由左大括號和右大括號括住的任何程式碼，都保留在同一行，而不考慮任何 VC 格式的值: [新行] 設定",
115115
"c_cpp.configuration.vcFormat.wrap.preserveBlocks.never.description":"程式碼區塊的格式一律以 VC 格式的值為準: [新行] 設定",
116116
"c_cpp.configuration.clang_format_path.description":"此為 clang-format 可執行檔的完整路徑。如果未指定，且在環境路徑中可用 clang-format，即會使用該格式。如果在環境路徑中找不到，則會使用延伸模組所配備的 clang-format 複本。",
117-
"c_cpp.configuration.clang_format_style.description":"Coding style, currently supports: Visual Studio,LLVM,Google,Chromium,Mozilla,WebKit. Use\"file\"to load the style from a.clang-formatfile in the current or parent directory. Use{key: value, ...}to set specific parameters. For example, the\"Visual Studio\"style is similar to: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
118-
"c_cpp.configuration.clang_format_fallbackStyle.description":"Name of the predefined style used as a fallback in case clang-format is invoked with style\"file\"but the.clang-formatfile is not found. Possible values areVisual Studio,LLVM,Google,Chromium,Mozilla,WebKit,none, or use{key: value, ...}to set specific parameters. For example, the\"Visual Studio\"style is similar to: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
117+
"c_cpp.configuration.clang_format_style.description":"編碼樣式，目前支援: Visual Studio、LLVM、Google、Chromium、Mozilla、WebKit。使用\"file\"可從目前目錄或父目錄的.clang-format檔案載入樣式。使用{key: value, ...}可設定特定參數。例如，\"Visual Studio\"樣式類似於: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
118+
"c_cpp.configuration.clang_format_fallbackStyle.description":"當已使用樣式\"file\"叫用 clang 格式，但找不到.clang-format檔案時，用作後援的預先定義樣式名稱。可能的值包括Visual Studio、LLVM、Google、Chromium、Mozilla、WebKit、none 或使用{key: value, ...}來設定特定參數。例如，\"Visual Studio\"樣式類似於: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
119119
"c_cpp.configuration.clang_format_sortIncludes.description":"若設定，會覆寫 SortIncludes 參數所決定的包含排序行為。",
120120
"c_cpp.configuration.intelliSenseEngine.description":"控制 IntelliSense 提供者。「標籤剖析器」會提供非內容感知的「模糊」結果。「預設」會提供內容感知的結果。「停用」會關閉 C/C++ 語言服務功能。",
121121
"c_cpp.configuration.intelliSenseEngineFallback.description":"控制 IntelliSense 引擎是否會自動切換到包含 #include 錯誤之編譯單位的標籤剖析器。",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"compiler.arguments":"用來修改所使用之包含或定義的編譯器引數，例如 {0}、{1} 等。",
3131
"one.argument.per.line":"每行一個引數。",
3232
"intellisense.mode":"IntelliSense 模式",
33-
"intellisense.mode.description":"The IntelliSensemode to use that maps to a platform and architecture variant ofMSVC,gcc, or Clang. If not set or if set to{0}, the extension will choose the default for that platform.Windowsdefaults to{1},Linuxdefaults to{2}, andmacOSdefaults to{3}. Select a specificIntelliSensemode to override the{4}mode. IntelliSense modes that only specify{5}variants (e.g. {6})are legacy modes and are converted automatically to the{7}variants based on the host platform.",
33+
"intellisense.mode.description":"要使用的 IntelliSense模式 (對應到MSVC、gcc 或 Clang 的平台及架構變體)。如果未設定或設為{0}，延伸模組會選擇該平台的預設。Windows預設為{1}、Linux預設為{2}、macOS預設為{3}。選取特定的IntelliSense模式可覆寫{4}模式。僅指定{5}變體 (例如 {6})的 IntelliSense 模式即為舊版模式，會依據主機平台自動轉換為{7}變體。",
3434
"include.path":"包含路徑",
3535
"include.path.description":"include 路徑是包含來源檔案所含之標頭檔 (例如 {0}) 的資料夾。請為 Intellisense 引擎指定搜尋所含標頭檔時所要使用的路徑清單。這些路徑不會重複搜尋。若要重複搜尋，請指定 {1}。例如 {2} 會搜尋所有子目錄，而 {3} 不會。若在安裝了 Visual Studio 的 Windows 上，或在 {4} 設定中指定了編譯器，就無須在此清單中列出系統的 include 路徑。",
3636
"one.include.path.per.line":"每行一個包含路徑。",

‎Extension/i18n/kor/c_cpp_properties.schema.json.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"c_cpp_properties.schema.json.definitions.configurations.items.properties.macFrameworkPath":"Mac 프레임워크에서 포함된 헤더를 검색하는 동안 사용할 IntelliSense 엔진의 경로 목록입니다. Mac 구성에서만 지원됩니다.",
1515
"c_cpp_properties.schema.json.definitions.configurations.items.properties.windowsSdkVersion":"Windows에서 사용할 Windows SDK 포함 경로의 버전입니다(예: '10.0.17134.0').",
1616
"c_cpp_properties.schema.json.definitions.configurations.items.properties.defines":"파일을 구문 분석하는 동안 사용할 IntelliSense 엔진의 전처리기 정의 목록입니다. 선택적으로 =을 사용하여 값을 설정합니다(예: VERSION= 1).",
17-
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode":"The IntelliSense mode to use that maps to a platform and architecture variant of MSVC, gcc, or Clang. If not set or if set to${default}, the extension will choose the default for that platform. Windows defaults to windows-msvc-x64, Linux defaults to linux-gcc-x64, and macOS defaults tomacos-clang-x64. IntelliSense modes that only specify<compiler>-<architecture>variants (e.g. gcc-x64) are legacy modes and are converted automatically to the<platform>-<compiler>-<architecture>variants based on the host platform.",
17+
"c_cpp_properties.schema.json.definitions.configurations.items.properties.intelliSenseMode":"MSVC, gcc 또는 Clang의 플랫폼 및 아키텍처 변형에 매핑되는 사용할 IntelliSense 모드입니다. 설정되지 않거나${default}로 설정된 경우 확장에서 해당 플랫폼의 기본값을 선택합니다. Windows의 경우 기본값인 windows-msvc-x64로 설정되고, Linux의 경우 기본값인 linux-gcc-x64로 설정되며, macOS의 경우 기본값인macos-clang-x64로 설정됩니다.<compiler>-<architecture>변형(예: gcc-x64)만 지정하는 IntelliSense 모드는 레거시 모드이며 호스트 플랫폼에 따라<platform>-<compiler>-<architecture>변형으로 자동으로 변환됩니다.",
1818
"c_cpp_properties.schema.json.definitions.configurations.items.properties.forcedInclude":"변환 단위에서 포함 파일 앞에 포함해야 하는 파일의 목록입니다.",
1919
"c_cpp_properties.schema.json.definitions.configurations.items.properties.configurationProvider":"소스 파일에 IntelliSense 구성 정보를 제공할 수 있는 VS Code 확장의 ID입니다.",
2020
"c_cpp_properties.schema.json.definitions.configurations.items.properties.browse.properties.limitSymbolsToIncludedHeaders":"true인 경우 직접적으로 또는 간접적으로 헤더로 포함된 파일만 처리되고, false인 경우 지정된 포함 경로 아래의 모든 파일이 처리됩니다.",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp