1 files changed, 34 insertions, 15 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 034090155..c57fbdda2 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -21,7 +21,7 @@
         "Programming Languages"
     ],
     "engines": {
-        "vscode": "^1.44.1"
+        "vscode": "^1.47.1"
     },
     "enableProposedApi": true,
     "scripts": {
@@ -35,27 +35,27 @@
         "test": "node ./out/tests/runTests.js"
     },
     "dependencies": {
-        "node-fetch": "^2.6.0",
-        "vscode-languageclient": "7.0.0-next.1"
+        "node-fetch": "^2.6.1",
+        "vscode-languageclient": "7.0.0-next.9"
     },
     "devDependencies": {
-        "@rollup/plugin-commonjs": "^13.0.0",
-        "@rollup/plugin-node-resolve": "^8.1.0",
-        "@types/glob": "^7.1.2",
+        "@rollup/plugin-commonjs": "^13.0.2",
+        "@rollup/plugin-node-resolve": "^8.4.0",
+        "@types/glob": "^7.1.3",
         "@types/mocha": "^7.0.2",
         "@types/node": "~12.7.0",
         "@types/node-fetch": "^2.5.7",
-        "@types/vscode": "^1.44.1",
-        "@typescript-eslint/eslint-plugin": "^3.4.0",
-        "@typescript-eslint/parser": "^3.4.0",
-        "eslint": "^7.3.1",
+        "@types/vscode": "^1.47.1",
+        "@typescript-eslint/eslint-plugin": "^3.10.1",
+        "@typescript-eslint/parser": "^3.10.1",
+        "eslint": "^7.8.0",
         "glob": "^7.1.6",
-        "mocha": "^8.0.1",
-        "rollup": "^2.18.1",
-        "tslib": "^2.0.0",
-        "typescript": "^3.9.5",
+        "mocha": "^8.1.3",
+        "rollup": "^2.26.9",
+        "tslib": "^2.0.1",
+        "typescript": "^3.9.7",
         "typescript-formatter": "^7.2.2",
-        "vsce": "^1.75.0",
+        "vsce": "^1.79.5",
         "vscode-test": "^1.4.0"
     },
     "activationEvents": [
@@ -626,6 +626,21 @@
                     },
                     "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
                     "default": []
+                },
+                "rust-analyzer.assist.importMergeBehaviour": {
+                    "type": "string",
+                    "enum": [
+                        "none",
+                        "full",
+                        "last"
+                    ],
+                    "enumDescriptions": [
+                        "No merging",
+                        "Merge all layers of the import trees",
+                        "Only merge the last layer of the import trees"
+                    ],
+                    "default": "full",
+                    "description": "The strategy to use when inserting new imports or merging imports."
                 }
             }
         },
@@ -864,6 +879,10 @@
             {
                 "id": "unsafe",
                 "description": "Style for unsafe operations"
+            },
+            {
+                "id": "consuming",
+                "description": "Style for non-Copy lvalues consumed by method/function call"
             }
         ],
         "semanticTokenScopes": [