diff options
Diffstat (limited to 'crates/ra_parser/src/grammar/expressions.rs')
-rw-r--r-- | crates/ra_parser/src/grammar/expressions.rs | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs index d733499d1..06c92645e 100644 --- a/crates/ra_parser/src/grammar/expressions.rs +++ b/crates/ra_parser/src/grammar/expressions.rs | |||
@@ -19,6 +19,26 @@ pub(super) fn expr(p: &mut Parser) -> (Option<CompletedMarker>, BlockLike) { | |||
19 | expr_bp(p, r, 1) | 19 | expr_bp(p, r, 1) |
20 | } | 20 | } |
21 | 21 | ||
22 | pub(super) fn expr_with_attrs(p: &mut Parser) -> bool { | ||
23 | let m = p.start(); | ||
24 | let has_attrs = p.at(T![#]); | ||
25 | attributes::outer_attributes(p); | ||
26 | |||
27 | let (cm, _block_like) = expr(p); | ||
28 | let success = cm.is_some(); | ||
29 | |||
30 | match (has_attrs, cm) { | ||
31 | (true, Some(cm)) => { | ||
32 | let kind = cm.kind(); | ||
33 | cm.undo_completion(p).abandon(p); | ||
34 | m.complete(p, kind); | ||
35 | } | ||
36 | _ => m.abandon(p), | ||
37 | } | ||
38 | |||
39 | success | ||
40 | } | ||
41 | |||
22 | pub(super) fn expr_stmt(p: &mut Parser) -> (Option<CompletedMarker>, BlockLike) { | 42 | pub(super) fn expr_stmt(p: &mut Parser) -> (Option<CompletedMarker>, BlockLike) { |
23 | let r = Restrictions { forbid_structs: false, prefer_stmt: true }; | 43 | let r = Restrictions { forbid_structs: false, prefer_stmt: true }; |
24 | expr_bp(p, r, 1) | 44 | expr_bp(p, r, 1) |
@@ -540,11 +560,13 @@ fn arg_list(p: &mut Parser) { | |||
540 | let m = p.start(); | 560 | let m = p.start(); |
541 | p.bump(T!['(']); | 561 | p.bump(T!['(']); |
542 | while !p.at(T![')']) && !p.at(EOF) { | 562 | while !p.at(T![')']) && !p.at(EOF) { |
543 | if !p.at_ts(EXPR_FIRST) { | 563 | // test arg_with_attr |
544 | p.error("expected expression"); | 564 | // fn main() { |
565 | // foo(#[attr] 92) | ||
566 | // } | ||
567 | if !expr_with_attrs(p) { | ||
545 | break; | 568 | break; |
546 | } | 569 | } |
547 | expr(p); | ||
548 | if !p.at(T![')']) && !p.expect(T![,]) { | 570 | if !p.at(T![')']) && !p.expect(T![,]) { |
549 | break; | 571 | break; |
550 | } | 572 | } |