Skip to content

Commit d31eff2

Browse files
authored
Merge branch 'main' into bobbrow/telemetryUpdate
2 parents 1aa22b8 + f28b789 commit d31eff2

File tree

20 files changed

+483
-340
lines changed

20 files changed

+483
-340
lines changed

.github/actions/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@actions/core": "^1.2.6",
1414
"@actions/github": "^2.1.1",
15-
"axios": "^0.21.1"
15+
"axios": "^0.21.4"
1616
},
1717
"devDependencies": {
1818
"eslint": "^6.8.0",

Extension/c_cpp_properties.schema.json

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@
1111
],
1212
"properties": {
1313
"name": {
14-
"description": "Configuration identifier. Mac, Linux, and Win32 are special identifiers for configurations that will be auto-selected on those platforms, but the identifier can be anything.",
14+
"markdownDescription": "Configuration identifier. `Mac`, `Linux`, and `Win32` are special identifiers for configurations that will be auto-selected on those platforms, but the identifier can be anything.",
15+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
1516
"type": "string"
1617
},
1718
"compilerPath": {
18-
"description": "Full path of the compiler being used, e.g. /usr/bin/gcc, to enable more accurate IntelliSense.",
19+
"markdownDescription": "Full path of the compiler being used, e.g. `/usr/bin/gcc`, to enable more accurate IntelliSense.",
20+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
1921
"type": "string"
2022
},
2123
"compilerArgs": {
22-
"description": "Compiler arguments to modify the includes or defines used, e.g. -nostdinc++, -m32, etc.",
24+
"markdownDescription": "Compiler arguments to modify the includes or defines used, e.g. `-nostdinc++`, `-m32`, etc.",
25+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
2326
"type": "array",
2427
"items": {
2528
"type": "string"
@@ -60,11 +63,13 @@
6063
]
6164
},
6265
"compileCommands": {
63-
"description": "Full path to compile_commands.json file for the workspace.",
66+
"markdownDescription": "Full path to `compile_commands.json` file for the workspace.",
67+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
6468
"type": "string"
6569
},
6670
"includePath": {
67-
"description": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive. Specify '**' to indicate recursive search. For example, '${workspaceFolder}/**' will search through all subdirectories while '${workspaceFolder}' will not.",
71+
"markdownDescription": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive. Specify `**` to indicate recursive search. For example, `${workspaceFolder}/**` will search through all subdirectories while `${workspaceFolder}` will not. Usually, this should not include system includes; instead, set `#C_Cpp.default.compilerPath#`.",
72+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
6873
"type": "array",
6974
"items": {
7075
"type": "string"
@@ -78,19 +83,22 @@
7883
}
7984
},
8085
"windowsSdkVersion": {
81-
"description": "Version of the Windows SDK include path to use on Windows, e.g. '10.0.17134.0'.",
86+
"markdownDescription": "Version of the Windows SDK include path to use on Windows, e.g. `10.0.17134.0`.",
87+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
8288
"type": "string",
8389
"pattern": "^\\d{2}\\.\\d{1}\\.\\d{5}\\.\\d{1}$|^8\\.1$"
8490
},
8591
"defines": {
86-
"description": "A list of preprocessor definitions for the IntelliSense engine to use while parsing files. Optionally, use = to set a value, e.g. VERSION=1.",
92+
"markdownDescription": "A list of preprocessor definitions for the IntelliSense engine to use while parsing files. Optionally, use `=` to set a value, e.g. `VERSION=1`.",
93+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
8794
"type": "array",
8895
"items": {
8996
"type": "string"
9097
}
9198
},
9299
"intelliSenseMode": {
93-
"description": "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 to macos-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.",
100+
"markdownDescription": "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 to `macos-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.",
101+
"descriptionHint": "Uses of words 'platform', 'compiler', and 'architecture' are meant to be descriptive placeholders for literal values, so they should be translated, but without changing the surrounding `<>-<>` symbols. All other text inside `` should not be translated.",
94102
"type": "string",
95103
"enum": [
96104
"macos-clang-x86",
@@ -151,7 +159,8 @@
151159
"type": "object",
152160
"properties": {
153161
"limitSymbolsToIncludedHeaders": {
154-
"description": "true to process only those files directly or indirectly included as headers, false to process all files under the specified include paths.",
162+
"markdownDescription": "`true` to process only those files directly or indirectly included as headers, `false` to process all files under the specified include paths.",
163+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
155164
"type": [
156165
"boolean",
157166
"string"
@@ -162,7 +171,8 @@
162171
"type": "string"
163172
},
164173
"path": {
165-
"description": "A list of paths to use for indexing and parsing of workspace symbols (for use by Go to Definition, Find All References, etc.). Searching on these paths is recursive by default. Specify '*' to indicate non-recursive search. For example, '${workspaceFolder}' will search through all subdirectories while '${workspaceFolder}/*' will not.",
174+
"markdownDescription": "A list of paths to use for indexing and parsing of workspace symbols (for use by 'Go to Definition', 'Find All References', etc.). Searching on these paths is recursive by default. Specify `*` to indicate non-recursive search. For example, `${workspaceFolder}` will search through all subdirectories while `${workspaceFolder}/*` will not.",
175+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
166176
"type": "array",
167177
"items": {
168178
"type": "string"
@@ -173,7 +183,8 @@
173183
},
174184
"customConfigurationVariables": {
175185
"type": "object",
176-
"description": "Custom variables that can be queried through the command ${cpptools:activeConfigCustomVariable} to use for the input variables in launch.json or tasks.json.",
186+
"markdownDescription": "Custom variables that can be queried through the command `${cpptools:activeConfigCustomVariable}` to use for the input variables in `launch.json` or `tasks.json`.",
187+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered.",
177188
"patternProperties": {
178189
"(^.+$)": {
179190
"type": "string"
@@ -187,10 +198,10 @@
187198
},
188199
"env": {
189200
"type": "object",
190-
"description": "Custom variables that can be reused anywhere in this file using the ${variable} or ${env:variable} syntax.",
191-
"descriptionHint": "The word 'variable' within curly braces should also be translated. The \"env\" should not be translated, and the punctuation (\"${:}\") should be preserved.",
201+
"markdownDescription": "Custom variables that can be reused anywhere in this file using the `${variable}` or `${env:variable}` syntax.",
202+
"descriptionHint": "The word 'variable' within curly braces should be translated. The \"env\" should not be translated, and the punctuation (\"${:}\") should be preserved.",
192203
"patternProperties": {
193-
"(?!^workspaceFolder$)(?!^workspaceRoot$)(?!^workspaceFolderBasename$)(?!^default$)(^.+$)": {
204+
"(?!^workspaceFolder$)(?!^workspaceRoot$)(?!^workspaceFolderBasename$)(?!^execPath$)(?!^pathSeparator$)(?!^default$)(^.+$)": {
194205
"oneOf": [
195206
{
196207
"type": "string"
@@ -213,7 +224,8 @@
213224
"enableConfigurationSquiggles": {
214225
"type": "boolean",
215226
"default": true,
216-
"description": "Controls whether the extension will report errors detected in c_cpp_properties.json."
227+
"markdownDescription": "Controls whether the extension will report errors detected in `c_cpp_properties.json`.",
228+
"descriptionHint": "Markdown text between `` should not be translated and the punctuation should not be altered."
217229
}
218230
},
219231
"properties": {

Extension/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ const processHtmlFiles = () => {
192192
const traverseJson = (jsonTree, descriptionCallback, prefixPath) => {
193193
for (let fieldName in jsonTree) {
194194
if (jsonTree[fieldName] !== null) {
195-
if (typeof (jsonTree[fieldName]) == "string" && fieldName === "description") {
195+
if (typeof (jsonTree[fieldName]) == "string" && (fieldName === "description" || fieldName === "markdownDescription")) {
196196
descriptionCallback(prefixPath, jsonTree[fieldName], jsonTree);
197197
} else if (typeof (jsonTree[fieldName]) == "object") {
198198
let path = prefixPath;

0 commit comments

Comments
 (0)