Merge #3662

3662: Support arbitrary discriminants r=matklad a=matklad

Closes #3661



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 6 insertions, 4 deletions

diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index c777bc9d0..74b9f514b 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -83,12 +83,14 @@ pub(crate) fn enum_variant_list(p: &mut Parser) {
             match p.current() {
                 T!['{'] => record_field_def_list(p),
                 T!['('] => tuple_field_def_list(p),
-                T![=] => {
-                    p.bump(T![=]);
-                    expressions::expr(p);
-                }
                 _ => (),
             }
+
+            // test variant_discriminant
+            // enum E { X(i32) = 10 }
+            if p.eat(T![=]) {
+                expressions::expr(p);
+            }
             var.complete(p, ENUM_VARIANT);
         } else {
             var.abandon(p);