language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix array element attribute position

Browse source
This commit is contained in:
Edwin Cheng 2020-01-16 23:37:43 +08:00
parent b2ed130ffd
commit ed8d5c86e3
5 changed files with 60 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_parser/src/grammar/expressions/atom.rs
View file

@ -192,9 +192,8 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
// 1,
// 2,
// ];
attributes::outer_attributes(p);
attributes::with_outer_attributes(p, |p| expr(p).0);
expr(p);
if p.eat(T![;]) {
expr(p);
p.expect(T![']']);
@ -212,12 +211,15 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
// #[cfg(test)]
// 2,
// ];
attributes::outer_attributes(p);
if !p.at_ts(EXPR_FIRST) {
p.error("expected expression");
if !attributes::with_outer_attributes(p, |p| {
if !p.at_ts(EXPR_FIRST) {
p.error("expected expression");
return None;
}
expr(p).0
}) {
break;
}
expr(p);
}
p.expect(T![']']);
m.complete(p, ARRAY_EXPR)