2 files changed, 44 insertions, 35 deletions

diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index 3ddd14f9c..f0c5c3cf3 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -25,6 +25,9 @@
             },
             "patterns": [
                 {
+                    "include": "#block-comments"
+                },
+                {
                     "include": "#comments"
                 },
                 {
@@ -185,6 +188,9 @@
             },
             "patterns": [
                 {
+                    "include": "#block-comments"
+                },
+                {
                     "include": "#comments"
                 },
                 {
@@ -212,6 +218,9 @@
             },
             "patterns": [
                 {
+                    "include": "#block-comments"
+                },
+                {
                     "include": "#comments"
                 },
                 {
@@ -232,6 +241,9 @@
             ]
         },
         {
+            "include": "#block-comments"
+        },
+        {
             "include": "#comments"
         },
         {
@@ -277,31 +289,30 @@
                 {
                     "comment": "documentation comments",
                     "name": "comment.line.documentation.rust",
-                    "match": "^\\s*///.*",
-                    "patterns": [
-                        {
-                            "include": "#comments"
-                        }
-                    ]
+                    "match": "^\\s*///.*"
                 },
                 {
                     "comment": "line comments",
                     "name": "comment.line.double-slash.rust",
-                    "match": "\\s*//.*",
-                    "patterns": [
-                        {
-                            "include": "#comments"
-                        }
-                    ]
+                    "match": "\\s*//.*"
                 },
                 {
+                    "comment": "inferred types, wildcard patterns, ignored params",
+                    "name": "comment.char.underscore.rust",
+                    "match": "\\b_\\w*\\b[^!(]"
+                }
+            ]
+        },
+        "block-comments": {
+            "patterns": [
+                {
                     "comment": "block comments",
                     "name": "comment.block.rust",
                     "begin": "/\\*(?!\\*)",
                     "end": "\\*/",
                     "patterns": [
                         {
-                            "include": "#comments"
+                            "include": "#block-comments"
                         }
                     ]
                 },
@@ -312,14 +323,9 @@
                     "end": "\\*/",
                     "patterns": [
                         {
-                            "include": "#comments"
+                            "include": "#block-comments"
                         }
                     ]
-                },
-                {
-                    "comment": "inferred types, wildcard patterns, ignored params",
-                    "name": "comment.char.underscore.rust",
-                    "match": "\\b_\\w*\\b"
                 }
             ]
         },
@@ -451,6 +457,9 @@
                     },
                     "patterns": [
                         {
+                            "include": "#block-comments"
+                        },
+                        {
                             "include": "#comments"
                         },
                         {
@@ -517,6 +526,9 @@
                     },
                     "patterns": [
                         {
+                            "include": "#block-comments"
+                        },
+                        {
                             "include": "#comments"
                         },
                         {
@@ -694,23 +706,15 @@
         "interpolations": {
             "comment": "curly brace interpolations",
             "name": "meta.interpolation.rust",
-            "begin": "{",
-            "beginCaptures": {
-                "0": {
+            "match": "({)[^\"{}]*(})",
+            "captures": {
+                "1": {
                     "name": "punctuation.definition.interpolation.rust"
-                }
-            },
-            "end": "}",
-            "endCaptures": {
-                "0": {
+                },
+                "2": {
                     "name": "punctuation.definition.interpolation.rust"
                 }
-            },
-            "patterns": [
-                {
-                    "include": "#interpolations"
-                }
-            ]
+            }
         },
         "lifetimes": {
             "patterns": [
@@ -806,6 +810,9 @@
                     },
                     "patterns": [
                         {
+                            "include": "#block-comments"
+                        },
+                        {
                             "include": "#comments"
                         },
                         {
@@ -980,7 +987,7 @@
                             "name": "punctuation.definition.string.rust"
                         }
                     },
-                    "end": "(\")(#*)",
+                    "end": "(\")(\\2)",
                     "endCaptures": {
                         "1": {
                             "name": "punctuation.definition.string.rust"
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index 459b7f250..17573cd82 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts
@@ -129,7 +129,9 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
     }
 
     const args = [...runnable.args.cargoArgs]; // should be a copy!
-    args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options.
+    if (runnable.args.cargoExtraArgs) {
+        args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options.
+    }
     if (runnable.args.executableArgs.length > 0) {
         args.push('--', ...runnable.args.executableArgs);
     }