Skip to content

Commit 1126243

Browse files
ColengmsColengms
authored
Merge main into insiders (#7266)
1 parent 673a68d commit 1126243

File tree

21 files changed

+1186
-1557
lines changed

21 files changed

+1186
-1557
lines changed

‎Extension/.vscode/tasks.json‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
"command": "yarn",
2121
"args": [
2222
"run",
23-
"compile",
24-
"--loglevel",
25-
"silent"
23+
"compile"
2624
]
2725
},
2826
{
@@ -95,9 +93,7 @@
9593
"command": "yarn",
9694
"args": [
9795
"run",
98-
"compile-watch",
99-
"--loglevel",
100-
"silent"
96+
"compile-watch"
10197
],
10298
"problemMatcher": [
10399
{
@@ -121,10 +117,10 @@
121117
"background": {
122118
"activeOnStart": true,
123119
"beginsPattern": {
124-
"regexp": "Compilation (.*?)starting…"
120+
"regexp": "asset"
125121
},
126122
"endsPattern": {
127-
"regexp": "Compilation (.*?)finished"
123+
"regexp": "webpack (.*?) compiled (.*?) ms"
128124
}
129125
}
130126
}
@@ -162,10 +158,10 @@
162158
"background": {
163159
"activeOnStart": true,
164160
"beginsPattern": {
165-
"regexp": "Compilation (.*?)starting…"
161+
"regexp": "asset"
166162
},
167163
"endsPattern": {
168-
"regexp": "Compilation (.*?)finished"
164+
"regexp": "webpack (.*?) compiled (.*?) ms"
169165
}
170166
}
171167
}

‎Extension/CHANGELOG.md‎

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

3+
## Version 1.3.0-insiders3: April 1, 2021
4+
### New Features
5+
* Add commands for navigating to matching preprocessor directives in conditional groups. [#7256](https://github.com/microsoft/vscode-cpptools/pull/7256)
6+
7+
### Bug Fixes
8+
* Fix detection of bitness for compilers targeting esp32. [#7034](https://github.com/microsoft/vscode-cpptools/issues/7034)
9+
* Fix comment continuations. [PR #7238](https://github.com/microsoft/vscode-cpptools/pull/7238)
10+
* Fix bug when `${workspaceFolder}` is used in `compileCommands`. [#7241](https://github.com/microsoft/vscode-cpptools/issues/7241)
11+
* Aleksa Pavlovic (@aleksa2808) [PR #7242](https://github.com/microsoft/vscode-cpptools/pull/7242)
12+
313
## Version 1.3.0-insiders2: March 25, 2021
414
### New Features
515
* Add highlighting of matching conditional preprocessor statements. [#2565](https://github.com/microsoft/vscode-cpptools/issues/2565)

‎Extension/package.json‎

Lines changed: 38 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
{
9393
"view": "debug",
9494
"contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
95-
"when": "debugStartLanguage == cpp || debugStartLanguage == c"
95+
"when": "debugStartLanguage == cpp || debugStartLanguage == c || debugStartLanguage == cuda-cpp"
9696
}
9797
],
9898
"problemMatchers": [
@@ -1269,18 +1269,23 @@
12691269
"light": "assets/ref-ungroup-by-type-light.svg",
12701270
"dark": "assets/ref-ungroup-by-type-dark.svg"
12711271
}
1272+
},
1273+
{
1274+
"command": "C_Cpp.GoToNextDirectiveInGroup",
1275+
"title": "%c_cpp.command.GoToNextDirectiveInGroup.title%",
1276+
"category": "C/C++"
1277+
},
1278+
{
1279+
"command": "C_Cpp.GoToPrevDirectiveInGroup",
1280+
"title": "%c_cpp.command.GoToPrevDirectiveInGroup.title%",
1281+
"category": "C/C++"
12721282
}
12731283
],
12741284
"keybindings": [
12751285
{
12761286
"command": "C_Cpp.SwitchHeaderSource",
12771287
"key": "Alt+O",
1278-
"when": "editorTextFocus && editorLangId == 'cpp'"
1279-
},
1280-
{
1281-
"command": "C_Cpp.SwitchHeaderSource",
1282-
"key": "Alt+O",
1283-
"when": "editorTextFocus && editorLangId == 'c'"
1288+
"when": "editorLangId == 'c' && editorTextFocus || editorLangId == 'cpp' && editorTextFocus || editorLangId == 'cuda-cpp' && editorTextFocus"
12841289
}
12851290
],
12861291
"debuggers": [
@@ -1289,7 +1294,8 @@
12891294
"label": "C++ (GDB/LLDB)",
12901295
"languages": [
12911296
"c",
1292-
"cpp"
1297+
"cpp",
1298+
"cuda-cpp"
12931299
],
12941300
"variables": {
12951301
"pickProcess": "extension.pickNativeProcess",
@@ -1911,7 +1917,8 @@
19111917
"label": "C++ (Windows)",
19121918
"languages": [
19131919
"c",
1914-
"cpp"
1920+
"cpp",
1921+
"cuda-cpp"
19151922
],
19161923
"variables": {
19171924
"pickProcess": "extension.pickNativeProcess"
@@ -2155,6 +2162,9 @@
21552162
{
21562163
"language": "cpp"
21572164
},
2165+
{
2166+
"language": "cuda-cpp"
2167+
},
21582168
{
21592169
"language": "cuda"
21602170
}
@@ -2180,42 +2190,22 @@
21802190
],
21812191
"editor/context": [
21822192
{
2183-
"when": "editorLangId == c",
2184-
"command": "C_Cpp.SwitchHeaderSource",
2185-
"group": "other1_navigation@1"
2186-
},
2187-
{
2188-
"when": "editorLangId == cpp",
2193+
"when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
21892194
"command": "C_Cpp.SwitchHeaderSource",
21902195
"group": "other1_navigation@1"
21912196
},
21922197
{
2193-
"when": "editorLangId == c",
2198+
"when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
21942199
"command": "workbench.action.gotoSymbol",
21952200
"group": "other1_navigation@3"
21962201
},
21972202
{
2198-
"when": "editorLangId == cpp",
2199-
"command": "workbench.action.gotoSymbol",
2200-
"group": "other1_navigation@3"
2201-
},
2202-
{
2203-
"when": "editorLangId == c",
2204-
"command": "workbench.action.showAllSymbols",
2205-
"group": "other1_navigation@4"
2206-
},
2207-
{
2208-
"when": "editorLangId == cpp",
2203+
"when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
22092204
"command": "workbench.action.showAllSymbols",
22102205
"group": "other1_navigation@4"
22112206
},
22122207
{
2213-
"when": "editorLangId == cpp",
2214-
"command": "C_Cpp.BuildAndDebugActiveFile",
2215-
"group": "other2_debug@1"
2216-
},
2217-
{
2218-
"when": "editorLangId == c",
2208+
"when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
22192209
"command": "C_Cpp.BuildAndDebugActiveFile",
22202210
"group": "other2_debug@1"
22212211
}
@@ -2237,6 +2227,11 @@
22372227
"editor.suggest.insertMode": "replace",
22382228
"editor.semanticHighlighting.enabled": true
22392229
},
2230+
"[cuda-cpp]": {
2231+
"editor.wordBasedSuggestions": false,
2232+
"editor.suggest.insertMode": "replace",
2233+
"editor.semanticHighlighting.enabled": true
2234+
},
22402235
"[c]": {
22412236
"editor.wordBasedSuggestions": false,
22422237
"editor.suggest.insertMode": "replace",
@@ -2381,10 +2376,10 @@
23812376
},
23822377
"scripts": {
23832378
"vscode:prepublish": "yarn run compile",
2384-
"compile": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --vscode-nls",
2379+
"compile": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --env vscode_nls",
23852380
"compile-dev": "node ./tools/prepublish.js && gulp generate-native-strings && webpack --mode development",
2386-
"compile-watch": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --vscode-nls --watch --info-verbosity verbose",
2387-
"compile-dev-watch": "node ./tools/prepublish.js && gulp generate-native-strings && webpack --mode development --watch --info-verbosity verbose",
2381+
"compile-watch": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --env vscode_nls --watch --progress",
2382+
"compile-dev-watch": "node ./tools/prepublish.js && gulp generate-native-strings && webpack --mode development --watch --progress",
23882383
"generateOptionsSchema": "node ./tools/prepublish.js && node ./out/tools/generateOptionsSchema.js",
23892384
"generate-native-strings": "node ./tools/prepublish.js && gulp generate-native-strings",
23902385
"translations-export": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-export",
@@ -2404,13 +2399,12 @@
24042399
"@octokit/rest": "^16.28.9",
24052400
"@types/minimatch": "^3.0.3",
24062401
"@types/mkdirp": "^0.5.2",
2407-
"@types/mocha": "^5.2.7",
2402+
"@types/mocha": "^8.2.2",
24082403
"@types/node": "^14.14.0",
24092404
"@types/plist": "^3.0.2",
24102405
"@types/semver": "^7.1.0",
24112406
"@types/tmp": "^0.1.0",
24122407
"@types/vscode": "1.53.0",
2413-
"@types/webpack": "^4.39.0",
24142408
"@types/which": "^1.3.2",
24152409
"@types/yauzl": "^2.9.1",
24162410
"@typescript-eslint/eslint-plugin": "^2.19.2",
@@ -2428,23 +2422,23 @@
24282422
"gulp-env": "^0.4.0",
24292423
"gulp-eslint": "^6.0.0",
24302424
"gulp-filter": "^6.0.0",
2431-
"gulp-mocha": "^7.0.1",
2425+
"gulp-mocha": "^8.0.0",
24322426
"gulp-sourcemaps": "^2.6.5",
24332427
"gulp-typescript": "^5.0.1",
24342428
"http-proxy-agent": "^2.1.0",
24352429
"minimist": "^1.2.5",
2436-
"mocha": "^5.2.0",
2430+
"mocha": "^8.3.2",
24372431
"parse5": "^5.1.0",
24382432
"parse5-traverse": "^1.0.3",
2439-
"ts-loader": "^6.0.4",
2433+
"ts-loader": "^8.1.0",
24402434
"tslint": "^5.19.0",
24412435
"typescript": "^3.5.3",
24422436
"vscode-debugadapter": "^1.35.0",
24432437
"vscode-debugprotocol": "^1.35.0",
24442438
"vscode-nls-dev": "^3.2.6",
24452439
"vscode-test": "^1.3.0",
2446-
"webpack": "^4.42.0",
2447-
"webpack-cli": "^3.3.7",
2440+
"webpack": "^5.28.0",
2441+
"webpack-cli": "^4.5.0",
24482442
"xml2js": "^0.4.19"
24492443
},
24502444
"dependencies": {
@@ -2454,7 +2448,7 @@
24542448
"https-proxy-agent": "^2.2.4",
24552449
"minimatch": "^3.0.4",
24562450
"mkdirp": "^0.5.1",
2457-
"plist": "^3.0.1",
2451+
"plist": "^3.0.2",
24582452
"tmp": "^0.1.0",
24592453
"vscode-cpptools": "^5.0.0",
24602454
"vscode-extension-telemetry": "^0.1.2",
@@ -2464,17 +2458,7 @@
24642458
"yauzl": "^2.10.0"
24652459
},
24662460
"resolutions": {
2467-
"elliptic": "^6.5.4",
2468-
"eslint/acorn": "^7.1.1",
2469-
"gulp-eslint/acorn": "^7.1.1",
2470-
"gulp-sourcemaps/acorn": "^5.7.4",
2471-
"https-proxy-agent": "^2.2.4",
2472-
"lodash": "^4.17.21",
24732461
"**/mkdirp/minimist": "^0.2.1",
2474-
"node-fetch": "^2.6.1",
2475-
"plist/xmldom": "^0.5.0",
2476-
"webpack/acorn": "^6.4.1",
2477-
"webpack/terser-webpack-plugin": "^1.4.5",
24782462
"yargs-parser": "^15.0.1",
24792463
"y18n": "^5.0.5"
24802464
},

‎Extension/package.nls.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"c_cpp.command.vcpkgClipboardInstallSuggested.title": "Copy vcpkg install command to clipboard",
1919
"c_cpp.command.vcpkgOnlineHelpSuggested.title": "Visit the vcpkg help page",
2020
"c_cpp.command.generateEditorConfig.title": "Generate EditorConfig contents from VC Format settings",
21+
"c_cpp.command.GoToNextDirectiveInGroup.title": "Go to next preprocessor directive in conditional group",
22+
"c_cpp.command.GoToPrevDirectiveInGroup.title": "Go to previous preprocessor directive in conditional group",
2123
"c_cpp.configuration.formatting.description": "Configures the formatting engine",
2224
"c_cpp.configuration.formatting.clangFormat.description": "clang-format will be used to format code.",
2325
"c_cpp.configuration.formatting.vcFormat.description": "The Visual C++ formatting engine will be used to format code.",

0 commit comments

Comments
 (0)