Merge main into insiders (#7266)

microsoft · Apr 1, 2021 · 1126243 · 1126243
1 parent 673a68d
commit 1126243
Show file tree

Hide file tree

Showing 21 changed files with 1,186 additions and 1,557 deletions.
diff --git a/Extension/.vscode/tasks.json b/Extension/.vscode/tasks.json
@@ -20,9 +20,7 @@
             "command": "yarn",
             "args": [
                 "run",
-                "compile",
-                "--loglevel",
-                "silent"
+                "compile"
             ]
         },
         {
@@ -95,9 +93,7 @@
             "command": "yarn",
             "args": [
                 "run",
-                "compile-watch",
-                "--loglevel",
-                "silent"
+                "compile-watch"
             ],
             "problemMatcher": [
                 {
@@ -121,10 +117,10 @@
                     "background": {
                         "activeOnStart": true,
                         "beginsPattern": {
-                            "regexp": "Compilation (.*?)starting…"
+                            "regexp": "asset"
                         },
                         "endsPattern": {
-                            "regexp": "Compilation (.*?)finished"
+                            "regexp": "webpack (.*?) compiled (.*?) ms"
                         }
                     }
                 }
@@ -162,10 +158,10 @@
                     "background": {
                         "activeOnStart": true,
                         "beginsPattern": {
-                            "regexp": "Compilation (.*?)starting…"
+                            "regexp": "asset"
                         },
                         "endsPattern": {
-                            "regexp": "Compilation (.*?)finished"
+                            "regexp": "webpack (.*?) compiled (.*?) ms"
                         }
                     }
                 }

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,5 +1,15 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 1.3.0-insiders3: April 1, 2021
+### New Features
+* Add commands for navigating to matching preprocessor directives in conditional groups. [#7256](https://github.com/microsoft/vscode-cpptools/pull/7256)
+
+### Bug Fixes
+* Fix detection of bitness for compilers targeting esp32. [#7034](https://github.com/microsoft/vscode-cpptools/issues/7034)
+* Fix comment continuations. [PR #7238](https://github.com/microsoft/vscode-cpptools/pull/7238)
+* Fix bug when `${workspaceFolder}` is used in `compileCommands`. [#7241](https://github.com/microsoft/vscode-cpptools/issues/7241)
+  * Aleksa Pavlovic (@aleksa2808) [PR #7242](https://github.com/microsoft/vscode-cpptools/pull/7242)
+
 ## Version 1.3.0-insiders2: March 25, 2021
 ### New Features
 * Add highlighting of matching conditional preprocessor statements. [#2565](https://github.com/microsoft/vscode-cpptools/issues/2565)

diff --git a/Extension/package.json b/Extension/package.json
@@ -92,7 +92,7 @@
       {
         "view": "debug",
         "contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
-        "when": "debugStartLanguage == cpp || debugStartLanguage == c"
+        "when": "debugStartLanguage == cpp || debugStartLanguage == c || debugStartLanguage == cuda-cpp"
       }
     ],
     "problemMatchers": [
@@ -1269,18 +1269,23 @@
           "light": "assets/ref-ungroup-by-type-light.svg",
           "dark": "assets/ref-ungroup-by-type-dark.svg"
         }
+      },
+      {
+        "command": "C_Cpp.GoToNextDirectiveInGroup",
+        "title": "%c_cpp.command.GoToNextDirectiveInGroup.title%",
+        "category": "C/C++"
+      },
+      {
+        "command": "C_Cpp.GoToPrevDirectiveInGroup",
+        "title": "%c_cpp.command.GoToPrevDirectiveInGroup.title%",
+        "category": "C/C++"
       }
     ],
     "keybindings": [
       {
         "command": "C_Cpp.SwitchHeaderSource",
         "key": "Alt+O",
-        "when": "editorTextFocus && editorLangId == 'cpp'"
-      },
-      {
-        "command": "C_Cpp.SwitchHeaderSource",
-        "key": "Alt+O",
-        "when": "editorTextFocus && editorLangId == 'c'"
+        "when": "editorLangId == 'c' && editorTextFocus || editorLangId == 'cpp' && editorTextFocus || editorLangId == 'cuda-cpp' && editorTextFocus"
       }
     ],
     "debuggers": [
@@ -1289,7 +1294,8 @@
         "label": "C++ (GDB/LLDB)",
         "languages": [
           "c",
-          "cpp"
+          "cpp",
+          "cuda-cpp"
         ],
         "variables": {
           "pickProcess": "extension.pickNativeProcess",
@@ -1911,7 +1917,8 @@
         "label": "C++ (Windows)",
         "languages": [
           "c",
-          "cpp"
+          "cpp",
+          "cuda-cpp"
         ],
         "variables": {
           "pickProcess": "extension.pickNativeProcess"
@@ -2155,6 +2162,9 @@
       {
         "language": "cpp"
       },
+      {
+        "language": "cuda-cpp"
+      },
       {
         "language": "cuda"
       }
@@ -2180,42 +2190,22 @@
       ],
       "editor/context": [
         {
-          "when": "editorLangId == c",
-          "command": "C_Cpp.SwitchHeaderSource",
-          "group": "other1_navigation@1"
-        },
-        {
-          "when": "editorLangId == cpp",
+          "when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
           "command": "C_Cpp.SwitchHeaderSource",
           "group": "other1_navigation@1"
         },
         {
-          "when": "editorLangId == c",
+          "when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
           "command": "workbench.action.gotoSymbol",
           "group": "other1_navigation@3"
         },
         {
-          "when": "editorLangId == cpp",
-          "command": "workbench.action.gotoSymbol",
-          "group": "other1_navigation@3"
-        },
-        {
-          "when": "editorLangId == c",
-          "command": "workbench.action.showAllSymbols",
-          "group": "other1_navigation@4"
-        },
-        {
-          "when": "editorLangId == cpp",
+          "when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
           "command": "workbench.action.showAllSymbols",
           "group": "other1_navigation@4"
         },
         {
-          "when": "editorLangId == cpp",
-          "command": "C_Cpp.BuildAndDebugActiveFile",
-          "group": "other2_debug@1"
-        },
-        {
-          "when": "editorLangId == c",
+          "when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
           "command": "C_Cpp.BuildAndDebugActiveFile",
           "group": "other2_debug@1"
         }
@@ -2237,6 +2227,11 @@
         "editor.suggest.insertMode": "replace",
         "editor.semanticHighlighting.enabled": true
       },
+      "[cuda-cpp]": {
+        "editor.wordBasedSuggestions": false,
+        "editor.suggest.insertMode": "replace",
+        "editor.semanticHighlighting.enabled": true
+      },
       "[c]": {
         "editor.wordBasedSuggestions": false,
         "editor.suggest.insertMode": "replace",
@@ -2381,10 +2376,10 @@
   },
   "scripts": {
     "vscode:prepublish": "yarn run compile",
-    "compile": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --vscode-nls",
+    "compile": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --env vscode_nls",
     "compile-dev": "node ./tools/prepublish.js && gulp generate-native-strings && webpack --mode development",
-    "compile-watch": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --vscode-nls --watch --info-verbosity verbose",
-    "compile-dev-watch": "node ./tools/prepublish.js && gulp generate-native-strings && webpack --mode development --watch --info-verbosity verbose",
+    "compile-watch": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-generate && webpack --mode production --env vscode_nls --watch --progress",
+    "compile-dev-watch": "node ./tools/prepublish.js && gulp generate-native-strings && webpack --mode development --watch --progress",
     "generateOptionsSchema": "node ./tools/prepublish.js && node ./out/tools/generateOptionsSchema.js",
     "generate-native-strings": "node ./tools/prepublish.js && gulp generate-native-strings",
     "translations-export": "node ./tools/prepublish.js && gulp generate-native-strings && gulp translations-export",
@@ -2404,13 +2399,12 @@
     "@octokit/rest": "^16.28.9",
     "@types/minimatch": "^3.0.3",
     "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.0",
     "@types/plist": "^3.0.2",
     "@types/semver": "^7.1.0",
     "@types/tmp": "^0.1.0",
     "@types/vscode": "1.53.0",
-    "@types/webpack": "^4.39.0",
     "@types/which": "^1.3.2",
     "@types/yauzl": "^2.9.1",
     "@typescript-eslint/eslint-plugin": "^2.19.2",
@@ -2428,23 +2422,23 @@
     "gulp-env": "^0.4.0",
     "gulp-eslint": "^6.0.0",
     "gulp-filter": "^6.0.0",
-    "gulp-mocha": "^7.0.1",
+    "gulp-mocha": "^8.0.0",
     "gulp-sourcemaps": "^2.6.5",
     "gulp-typescript": "^5.0.1",
     "http-proxy-agent": "^2.1.0",
     "minimist": "^1.2.5",
-    "mocha": "^5.2.0",
+    "mocha": "^8.3.2",
     "parse5": "^5.1.0",
     "parse5-traverse": "^1.0.3",
-    "ts-loader": "^6.0.4",
+    "ts-loader": "^8.1.0",
     "tslint": "^5.19.0",
     "typescript": "^3.5.3",
     "vscode-debugadapter": "^1.35.0",
     "vscode-debugprotocol": "^1.35.0",
     "vscode-nls-dev": "^3.2.6",
     "vscode-test": "^1.3.0",
-    "webpack": "^4.42.0",
-    "webpack-cli": "^3.3.7",
+    "webpack": "^5.28.0",
+    "webpack-cli": "^4.5.0",
     "xml2js": "^0.4.19"
   },
   "dependencies": {
@@ -2454,7 +2448,7 @@
     "https-proxy-agent": "^2.2.4",
     "minimatch": "^3.0.4",
     "mkdirp": "^0.5.1",
-    "plist": "^3.0.1",
+    "plist": "^3.0.2",
     "tmp": "^0.1.0",
     "vscode-cpptools": "^5.0.0",
     "vscode-extension-telemetry": "^0.1.2",
@@ -2464,17 +2458,7 @@
     "yauzl": "^2.10.0"
   },
   "resolutions": {
-    "elliptic": "^6.5.4",
-    "eslint/acorn": "^7.1.1",
-    "gulp-eslint/acorn": "^7.1.1",
-    "gulp-sourcemaps/acorn": "^5.7.4",
-    "https-proxy-agent": "^2.2.4",
-    "lodash": "^4.17.21",
     "**/mkdirp/minimist": "^0.2.1",
-    "node-fetch": "^2.6.1",
-    "plist/xmldom": "^0.5.0",
-    "webpack/acorn": "^6.4.1",
-    "webpack/terser-webpack-plugin": "^1.4.5",
     "yargs-parser": "^15.0.1",
     "y18n": "^5.0.5"
   },

diff --git a/Extension/package.nls.json b/Extension/package.nls.json
@@ -18,6 +18,8 @@
     "c_cpp.command.vcpkgClipboardInstallSuggested.title": "Copy vcpkg install command to clipboard",
     "c_cpp.command.vcpkgOnlineHelpSuggested.title": "Visit the vcpkg help page",
     "c_cpp.command.generateEditorConfig.title": "Generate EditorConfig contents from VC Format settings",
+    "c_cpp.command.GoToNextDirectiveInGroup.title": "Go to next preprocessor directive in conditional group",
+    "c_cpp.command.GoToPrevDirectiveInGroup.title": "Go to previous preprocessor directive in conditional group",
     "c_cpp.configuration.formatting.description": "Configures the formatting engine",
     "c_cpp.configuration.formatting.clangFormat.description": "clang-format will be used to format code.",
     "c_cpp.configuration.formatting.vcFormat.description": "The Visual C++ formatting engine will be used to format code.",