diff options
Diffstat (limited to 'crates/ra_parser/src/grammar/expressions')
-rw-r--r-- | crates/ra_parser/src/grammar/expressions/atom.rs | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs index 700994e80..a98a2a3ef 100644 --- a/crates/ra_parser/src/grammar/expressions/atom.rs +++ b/crates/ra_parser/src/grammar/expressions/atom.rs | |||
@@ -181,47 +181,42 @@ fn tuple_expr(p: &mut Parser) -> CompletedMarker { | |||
181 | fn array_expr(p: &mut Parser) -> CompletedMarker { | 181 | fn array_expr(p: &mut Parser) -> CompletedMarker { |
182 | assert!(p.at(T!['['])); | 182 | assert!(p.at(T!['['])); |
183 | let m = p.start(); | 183 | let m = p.start(); |
184 | p.bump(T!['[']); | ||
185 | if p.eat(T![']']) { | ||
186 | return m.complete(p, ARRAY_EXPR); | ||
187 | } | ||
188 | 184 | ||
189 | // test first_array_member_attributes | 185 | let mut n_exprs = 0u32; |
190 | // pub const A: &[i64] = &[ | 186 | let mut has_semi = false; |
191 | // #[cfg(test)] | ||
192 | // 1, | ||
193 | // 2, | ||
194 | // ]; | ||
195 | attributes::with_outer_attributes(p, |p| expr(p).0); | ||
196 | 187 | ||
197 | if p.eat(T![;]) { | 188 | p.bump(T!['[']); |
198 | expr(p); | ||
199 | p.expect(T![']']); | ||
200 | return m.complete(p, ARRAY_EXPR); | ||
201 | } | ||
202 | while !p.at(EOF) && !p.at(T![']']) { | 189 | while !p.at(EOF) && !p.at(T![']']) { |
203 | p.expect(T![,]); | 190 | n_exprs += 1; |
204 | if p.at(T![']']) { | 191 | |
205 | break; | 192 | // test array_attrs |
206 | } | 193 | // const A: &[i64] = &[1, #[cfg(test)] 2]; |
194 | let m = p.start(); | ||
195 | let has_attrs = p.at(T![#]); | ||
196 | attributes::outer_attributes(p); | ||
207 | 197 | ||
208 | // test subsequent_array_member_attributes | 198 | let cm = expr(p).0; |
209 | // pub const A: &[i64] = &[ | 199 | |
210 | // 1, | 200 | match (has_attrs, cm) { |
211 | // #[cfg(test)] | 201 | (true, Some(cm)) => { |
212 | // 2, | 202 | let kind = cm.kind(); |
213 | // ]; | 203 | cm.undo_completion(p).abandon(p); |
214 | if !attributes::with_outer_attributes(p, |p| { | 204 | m.complete(p, kind); |
215 | if !p.at_ts(EXPR_FIRST) { | ||
216 | p.error("expected expression"); | ||
217 | return None; | ||
218 | } | 205 | } |
219 | expr(p).0 | 206 | _ => m.abandon(p), |
220 | }) { | 207 | } |
208 | |||
209 | if n_exprs == 1 && p.eat(T![;]) { | ||
210 | has_semi = true; | ||
211 | continue; | ||
212 | } | ||
213 | |||
214 | if has_semi || !p.at(T![']']) && !p.expect(T![,]) { | ||
221 | break; | 215 | break; |
222 | } | 216 | } |
223 | } | 217 | } |
224 | p.expect(T![']']); | 218 | p.expect(T![']']); |
219 | |||
225 | m.complete(p, ARRAY_EXPR) | 220 | m.complete(p, ARRAY_EXPR) |
226 | } | 221 | } |
227 | 222 | ||