3 files changed, 24 insertions, 5 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 63ba4bdf1..33d60d4dd 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1761,9 +1761,9 @@
             "dev": true
         },
         "node-fetch": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-            "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+            "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
         },
         "normalize-path": {
             "version": "3.0.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index 6fc4464df..c57fbdda2 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -35,7 +35,7 @@
         "test": "node ./out/tests/runTests.js"
     },
     "dependencies": {
-        "node-fetch": "^2.6.0",
+        "node-fetch": "^2.6.1",
         "vscode-languageclient": "7.0.0-next.9"
     },
     "devDependencies": {
@@ -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": [
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 69f2836ad..4321de244 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -195,7 +195,7 @@ export function ssr(ctx: Ctx): Cmd {
 
         const options: vscode.InputBoxOptions = {
             value: "() ==>> ()",
-            prompt: "Enter request, for example 'Foo($a) ==> Foo::new($a)' ",
+            prompt: "Enter request, for example 'Foo($a) ==>> Foo::new($a)' ",
             validateInput: async (x: string) => {
                 try {
                     await client.sendRequest(ra.ssr, {