Move parsing of field pattern lists to the parser (where it belongs)

1 files changed, 17 insertions, 9 deletions

diff --git a/crates/ra_syntax/src/grammar/patterns.rs b/crates/ra_syntax/src/grammar/patterns.rs
index 7820c4e02..ff9d94f8a 100644
--- a/crates/ra_syntax/src/grammar/patterns.rs
+++ b/crates/ra_syntax/src/grammar/patterns.rs
@@ -128,15 +128,7 @@ fn field_pat_list(p: &mut Parser) {
     while !p.at(EOF) && !p.at(R_CURLY) {
         match p.current() {
             DOTDOT => p.bump(),
-            IDENT if p.nth(1) == COLON => {
-                p.bump();
-                p.bump();
-                pattern(p);
-            }
-            L_CURLY => error_block(p, "expected ident"),
-            _ => {
-                bind_pat(p, false);
-            }
+            _ => field_pat(p),
         }
         if !p.at(R_CURLY) {
             p.expect(COMMA);
@@ -146,6 +138,22 @@ fn field_pat_list(p: &mut Parser) {
     m.complete(p, FIELD_PAT_LIST);
 }
 
+fn field_pat(p: &mut Parser) {
+    let m = p.start();
+    match p.current() {
+        IDENT if p.nth(1) == COLON => {
+            name(p);
+            p.bump();
+            pattern(p);
+        }
+        L_CURLY => error_block(p, "expected ident"),
+        _ => {
+            bind_pat(p, false);
+        }
+    }
+    m.complete(p, FIELD_PAT);
+}
+
 // test placeholder_pat
 // fn main() { let _ = (); }
 fn placeholder_pat(p: &mut Parser) -> CompletedMarker {