5 files changed, 62 insertions, 14 deletions

diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index 06c92645e..4163a2cf5 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -169,6 +169,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
     //     let d: i32 = 92;
     //     let e: !;
     //     let _: ! = {};
+    //     let f = #[attr]||{};
     // }
     fn let_stmt(p: &mut Parser, m: Marker, with_semi: StmtWithSemi) {
         assert!(p.at(T![let]));
@@ -178,7 +179,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
             types::ascription(p);
         }
         if p.eat(T![=]) {
-            expressions::expr(p);
+            expressions::expr_with_attrs(p);
         }
 
         match with_semi {
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
index 86803fe08..fa8ee49a2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
@@ -5,4 +5,5 @@ fn foo() {
     let d: i32 = 92;
     let e: !;
     let _: ! = {};
+    let f = #[attr]||{};
 }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
index 97166cfd5..17739dfbd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
@@ -1,5 +1,5 @@
-SOURCE_FILE@[0; 110)
-  FN_DEF@[0; 109)
+SOURCE_FILE@[0; 135)
+  FN_DEF@[0; 134)
     FN_KW@[0; 2) "fn"
     WHITESPACE@[2; 3) " "
     NAME@[3; 6)
@@ -8,8 +8,8 @@ SOURCE_FILE@[0; 110)
       L_PAREN@[6; 7) "("
       R_PAREN@[7; 8) ")"
     WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 109)
-      BLOCK@[9; 109)
+    BLOCK_EXPR@[9; 134)
+      BLOCK@[9; 134)
         L_CURLY@[9; 10) "{"
         WHITESPACE@[10; 15) "\n    "
         LET_STMT@[15; 21)
@@ -97,6 +97,33 @@ SOURCE_FILE@[0; 110)
               L_CURLY@[104; 105) "{"
               R_CURLY@[105; 106) "}"
           SEMI@[106; 107) ";"
-        WHITESPACE@[107; 108) "\n"
-        R_CURLY@[108; 109) "}"
-  WHITESPACE@[109; 110) "\n"
+        WHITESPACE@[107; 112) "\n    "
+        LET_STMT@[112; 132)
+          LET_KW@[112; 115) "let"
+          WHITESPACE@[115; 116) " "
+          BIND_PAT@[116; 117)
+            NAME@[116; 117)
+              IDENT@[116; 117) "f"
+          WHITESPACE@[117; 118) " "
+          EQ@[118; 119) "="
+          WHITESPACE@[119; 120) " "
+          LAMBDA_EXPR@[120; 131)
+            ATTR@[120; 127)
+              POUND@[120; 121) "#"
+              L_BRACK@[121; 122) "["
+              PATH@[122; 126)
+                PATH_SEGMENT@[122; 126)
+                  NAME_REF@[122; 126)
+                    IDENT@[122; 126) "attr"
+              R_BRACK@[126; 127) "]"
+            PARAM_LIST@[127; 129)
+              PIPE@[127; 128) "|"
+              PIPE@[128; 129) "|"
+            BLOCK_EXPR@[129; 131)
+              BLOCK@[129; 131)
+                L_CURLY@[129; 130) "{"
+                R_CURLY@[130; 131) "}"
+          SEMI@[131; 132) ";"
+        WHITESPACE@[132; 133) "\n"
+        R_CURLY@[133; 134) "}"
+  WHITESPACE@[134; 135) "\n"
diff --git a/editors/code/package.json b/editors/code/package.json
index df8265be1..b013c3f4a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -155,11 +155,6 @@
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "rust-analyzer.run",
-                "key": "ctrl+r",
-                "when": "editorTextFocus && editorLangId == rust"
-            },
-            {
                 "command": "rust-analyzer.onEnter",
                 "key": "enter",
                 "when": "editorTextFocus && !suggestWidgetVisible && editorLangId == rust && !vim.active || vim.mode == 'Insert' && editorTextFocus && !suggestWidgetVisible && editorLangId == rust"
@@ -187,7 +182,29 @@
                 "rust-analyzer.featureFlags": {
                     "type": "object",
                     "default": {},
-                    "description": "Fine grained feature flags to disable annoying features"
+                    "description": "Fine grained feature flags to disable annoying features",
+                    "properties": {
+                        "lsp.diagnostics": {
+                            "type": "boolean",
+                            "description": "Whether to show diagnostics from `cargo check`"
+                        },
+                        "completion.insertion.add-call-parenthesis": {
+                            "type": "boolean",
+                            "description": "Whether to add parenthesis when completing functions"
+                        },
+                        "completion.enable-postfix": {
+                            "type": "boolean",
+                            "description": "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
+                        },
+                        "notifications.workspace-loaded": {
+                            "type": "boolean",
+                            "description": "Whether to show `workspace loaded` message"
+                        },
+                        "notifications.cargo-toml-not-found": {
+                            "type": "boolean",
+                            "description": "Whether to show `can't find Cargo.toml` error message"
+                        }
+                    }
                 },
                 "rust-analyzer.serverPath": {
                     "type": [
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 5951cf1b4..6871bc111 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -42,12 +42,14 @@ export function activateInlayHints(ctx: Ctx) {
 const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
     after: {
         color: new vscode.ThemeColor('rust_analyzer.inlayHint'),
+        fontStyle: "normal",
     },
 });
 
 const parameterHintDecorationType = vscode.window.createTextEditorDecorationType({
     before: {
         color: new vscode.ThemeColor('rust_analyzer.inlayHint'),
+        fontStyle: "normal",
     },
 });