tmp

Author: tomjakubowski

crates/ra_parser/src/grammar/patterns.rs

@@ -58,12 +58,6 @@ const PAT_RECOVERY_SET: TokenSet =
 fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> {
     let la0 = p.nth(0);
     let la1 = p.nth(1);
-    if la0 == IDENT && la1 == T![..] {
-        let m = p.start();
-        p.bump();
-        p.bump();
-        return Some(m.complete(p, SUBSLICE_PAT));
-    }
     if la0 == T![ref]
         || la0 == T![mut]
         || la0 == T![box]
@@ -151,7 +145,21 @@ fn path_pat(p: &mut Parser) -> CompletedMarker {
 fn tuple_pat_fields(p: &mut Parser) {
     assert!(p.at(T!['(']));
     p.bump();
-    pat_list(p, T![')']);
+    while !p.at(EOF) && !p.at(T![')']) {
+        match p.current() {
+            T![..] => p.bump(),
+            _ => {
+                if !p.at_ts(PATTERN_FIRST) {
+                    p.error("expected a pattern");
+                    break;
+                }
+                pattern(p)
+            }
+        }
+        if !p.at(T![')']) {
+            p.expect(T![,]);
+        }
+    }
     p.expect(T![')']);
 }
 
@@ -237,15 +245,15 @@ fn slice_pat(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T!['[']));
     let m = p.start();
     p.bump();
-    pat_list(p, T![']']);
-    p.expect(T![']']);
-    m.complete(p, SLICE_PAT)
-}
-
-fn pat_list(p: &mut Parser, ket: SyntaxKind) {
-    while !p.at(EOF) && !p.at(ket) {
+    while !p.at(EOF) && !p.at(T![']']) {
         match p.current() {
             T![..] => p.bump(),
+            IDENT if p.nth(1) == T![..] => {
+                let m_sub = p.start();
+                p.bump();
+                p.bump();
+                m_sub.complete(p, SUBSLICE_PAT);
+            }
             _ => {
                 if !p.at_ts(PATTERN_FIRST) {
                     p.error("expected a pattern");
@@ -254,10 +262,12 @@ fn pat_list(p: &mut Parser, ket: SyntaxKind) {
                 pattern(p)
             }
         }
-        if !p.at(ket) {
+        if !p.at(T![']']) {
             p.expect(T![,]);
         }
     }
+    p.expect(T![']']);
+    m.complete(p, SLICE_PAT)
 }
 
 // test bind_pat

crates/ra_syntax/tests/data/parser/inline/ok/0024_slice_pat.txt

@@ -60,4 +60,3 @@ SOURCE_FILE@[0; 62)
       WHITESPACE@[59; 60) "\n"
       R_CURLY@[60; 61) "}"
   WHITESPACE@[61; 62) "\n"
-