aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-27 09:04:02 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-27 09:04:02 +0000
commit964086e0d4874d7e60eb3607220e486ec4b51f86 (patch)
tree9b51ccea5712afb89896dd42de030f4201e2a40c
parentffcf61884245ca515f08f8685dc324b9db727e53 (diff)
parent4d35cc387576be6645b12d24af09b1e9c3a5f65b (diff)
Merge #685
685: Support attributes on let statements r=matklad a=DJMcNab Fix #677. Co-authored-by: DJMcNab <[email protected]>
Diffstat
-rw-r--r--crates/ra_syntax/src/grammar/expressions.rs81
-rw-r--r--crates/ra_syntax/src/grammar/items.rs2
-rw-r--r--crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.rs5
-rw-r--r--crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.txt73
4 files changed, 125 insertions, 36 deletions
diff --git a/crates/ra_syntax/src/grammar/expressions.rs b/crates/ra_syntax/src/grammar/expressions.rs
index 1604d9b5a..d27eb8b7e 100644
--- a/crates/ra_syntax/src/grammar/expressions.rs
+++ b/crates/ra_syntax/src/grammar/expressions.rs
@@ -45,7 +45,6 @@ pub(crate) fn block(p: &mut Parser) {
45 45
46 while !p.at(EOF) && !p.at(R_CURLY) { 46 while !p.at(EOF) && !p.at(R_CURLY) {
47 match p.current() { 47 match p.current() {
48 LET_KW => let_stmt(p),
49 // test nocontentexpr 48 // test nocontentexpr
50 // fn foo(){ 49 // fn foo(){
51 // ;;;some_expr();;;;{;;;};;;;Ok(()) 50 // ;;;some_expr();;;;{;;;};;;;Ok(())
@@ -55,41 +54,54 @@ pub(crate) fn block(p: &mut Parser) {
55 // test block_items 54 // test block_items
56 // fn a() { fn b() {} } 55 // fn a() { fn b() {} }
57 let m = p.start(); 56 let m = p.start();
58 match items::maybe_item(p, items::ItemFlavor::Mod) { 57 let has_attrs = p.at(POUND);
59 items::MaybeItem::Item(kind) => { 58 attributes::outer_attributes(p);
60 m.complete(p, kind); 59 if p.at(LET_KW) {
61 } 60 let_stmt(p, m);
62 items::MaybeItem::Modifiers => { 61 } else {
63 m.abandon(p); 62 match items::maybe_item(p, items::ItemFlavor::Mod) {
64 p.error("expected an item"); 63 items::MaybeItem::Item(kind) => {
65 } 64 m.complete(p, kind);
66 // test pub_expr 65 }
67 // fn foo() { pub 92; } //FIXME 66 items::MaybeItem::Modifiers => {
68 items::MaybeItem::None => {
69 let is_blocklike = expressions::expr_stmt(p) == BlockLike::Block;
70 if p.at(R_CURLY) {
71 m.abandon(p); 67 m.abandon(p);
72 } else { 68 p.error("expected an item");
73 // test no_semi_after_block 69 }
74 // fn foo() { 70 // test pub_expr
75 // if true {} 71 // fn foo() { pub 92; } //FIXME
76 // loop {} 72 items::MaybeItem::None => {
77 // match () {} 73 if has_attrs {
78 // while true {} 74 m.abandon(p);
79 // for _ in () {} 75 p.error(
80 // {} 76 "expected a let statement or an item after attributes in block",
81 // {} 77 );
82 // macro_rules! test {
83 // () => {}
84 // }
85 // test!{}
86 // }
87 if is_blocklike {
88 p.eat(SEMI);
89 } else { 78 } else {
90 p.expect(SEMI); 79 let is_blocklike = expressions::expr_stmt(p) == BlockLike::Block;
80 if p.at(R_CURLY) {
81 m.abandon(p);
82 } else {
83 // test no_semi_after_block
84 // fn foo() {
85 // if true {}
86 // loop {}
87 // match () {}
88 // while true {}
89 // for _ in () {}
90 // {}
91 // {}
92 // macro_rules! test {
93 // () => {}
94 // }
95 // test!{}
96 // }
97 if is_blocklike {
98 p.eat(SEMI);
99 } else {
100 p.expect(SEMI);
101 }
102 m.complete(p, EXPR_STMT);
103 }
91 } 104 }
92 m.complete(p, EXPR_STMT);
93 } 105 }
94 } 106 }
95 } 107 }
@@ -106,9 +118,8 @@ pub(crate) fn block(p: &mut Parser) {
106 // let c = 92; 118 // let c = 92;
107 // let d: i32 = 92; 119 // let d: i32 = 92;
108 // } 120 // }
109 fn let_stmt(p: &mut Parser) { 121 fn let_stmt(p: &mut Parser, m: Marker) {
110 assert!(p.at(LET_KW)); 122 assert!(p.at(LET_KW));
111 let m = p.start();
112 p.bump(); 123 p.bump();
113 patterns::pattern(p); 124 patterns::pattern(p);
114 if p.at(COLON) { 125 if p.at(COLON) {
diff --git a/crates/ra_syntax/src/grammar/items.rs b/crates/ra_syntax/src/grammar/items.rs
index 265e84570..18039cd3f 100644
--- a/crates/ra_syntax/src/grammar/items.rs
+++ b/crates/ra_syntax/src/grammar/items.rs
@@ -36,6 +36,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![
36 36
37pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool, flavor: ItemFlavor) { 37pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool, flavor: ItemFlavor) {
38 let m = p.start(); 38 let m = p.start();
39 attributes::outer_attributes(p);
39 match maybe_item(p, flavor) { 40 match maybe_item(p, flavor) {
40 MaybeItem::Item(kind) => { 41 MaybeItem::Item(kind) => {
41 m.complete(p, kind); 42 m.complete(p, kind);
@@ -79,7 +80,6 @@ pub(super) enum MaybeItem {
79} 80}
80 81
81pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem { 82pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem {
82 attributes::outer_attributes(p);
83 opt_visibility(p); 83 opt_visibility(p);
84 if let Some(kind) = items_without_modifiers(p) { 84 if let Some(kind) = items_without_modifiers(p) {
85 return MaybeItem::Item(kind); 85 return MaybeItem::Item(kind);
diff --git a/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.rs b/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.rs
new file mode 100644
index 000000000..325a97aeb
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.rs
@@ -0,0 +1,5 @@
1// https://github.com/rust-analyzer/rust-analyzer/issues/677
2fn main() {
3 #[cfg(feature = "backtrace")]
4 let exit_code = panic::catch_unwind(move || main());
5}
diff --git a/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.txt b/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.txt
new file mode 100644
index 000000000..1f52f699b
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.txt
@@ -0,0 +1,73 @@
1SOURCE_FILE@[0; 166)
2 FN_DEF@[0; 165)
3 COMMENT@[0; 60)
4 WHITESPACE@[60; 61)
5 FN_KW@[61; 63)
6 WHITESPACE@[63; 64)
7 NAME@[64; 68)
8 IDENT@[64; 68) "main"
9 PARAM_LIST@[68; 70)
10 L_PAREN@[68; 69)
11 R_PAREN@[69; 70)
12 WHITESPACE@[70; 71)
13 BLOCK@[71; 165)
14 L_CURLY@[71; 72)
15 WHITESPACE@[72; 77)
16 LET_STMT@[77; 163)
17 ATTR@[77; 106)
18 POUND@[77; 78)
19 TOKEN_TREE@[78; 106)
20 L_BRACK@[78; 79)
21 IDENT@[79; 82) "cfg"
22 TOKEN_TREE@[82; 105)
23 L_PAREN@[82; 83)
24 IDENT@[83; 90) "feature"
25 WHITESPACE@[90; 91)
26 EQ@[91; 92)
27 WHITESPACE@[92; 93)
28 STRING@[93; 104)
29 R_PAREN@[104; 105)
30 R_BRACK@[105; 106)
31 WHITESPACE@[106; 111)
32 LET_KW@[111; 114)
33 WHITESPACE@[114; 115)
34 BIND_PAT@[115; 124)
35 NAME@[115; 124)
36 IDENT@[115; 124) "exit_code"
37 WHITESPACE@[124; 125)
38 EQ@[125; 126)
39 WHITESPACE@[126; 127)
40 CALL_EXPR@[127; 162)
41 PATH_EXPR@[127; 146)
42 PATH@[127; 146)
43 PATH@[127; 132)
44 PATH_SEGMENT@[127; 132)
45 NAME_REF@[127; 132)
46 IDENT@[127; 132) "panic"
47 COLONCOLON@[132; 134)
48 PATH_SEGMENT@[134; 146)
49 NAME_REF@[134; 146)
50 IDENT@[134; 146) "catch_unwind"
51 ARG_LIST@[146; 162)
52 L_PAREN@[146; 147)
53 LAMBDA_EXPR@[147; 161)
54 MOVE_KW@[147; 151)
55 WHITESPACE@[151; 152)
56 PARAM_LIST@[152; 154)
57 PIPE@[152; 153)
58 PIPE@[153; 154)
59 WHITESPACE@[154; 155)
60 CALL_EXPR@[155; 161)
61 PATH_EXPR@[155; 159)
62 PATH@[155; 159)
63 PATH_SEGMENT@[155; 159)
64 NAME_REF@[155; 159)
65 IDENT@[155; 159) "main"
66 ARG_LIST@[159; 161)
67 L_PAREN@[159; 160)
68 R_PAREN@[160; 161)
69 R_PAREN@[161; 162)
70 SEMI@[162; 163)
71 WHITESPACE@[163; 164)
72 R_CURLY@[164; 165)
73 WHITESPACE@[165; 166)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 07:15:59 +0100