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

Make attrs be a child of the let statement

Browse source
This commit is contained in:
DJMcNab 2019-01-26 22:02:23 +00:00
parent 55a3e21ac4
commit 7055d43c3a
3 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_syntax/src/grammar/expressions.rs
View file

@ -45,7 +45,10 @@ pub(crate) fn block(p: &mut Parser) {
while !p.at(EOF) && !p.at(R_CURLY) {
match p.current() {
LET_KW => let_stmt(p),
LET_KW => {
let m = p.start();
let_stmt(p, m)
}
// test nocontentexpr
// fn foo(){
// ;;;some_expr();;;;{;;;};;;;Ok(())
@ -54,8 +57,9 @@ pub(crate) fn block(p: &mut Parser) {
_ => {
// test block_items
// fn a() { fn b() {} }
let has_attrs = p.at(POUND);
let m = p.start();
let has_attrs = p.at(POUND);
attributes::outer_attributes(p);
match items::maybe_item(p, items::ItemFlavor::Mod) {
items::MaybeItem::Item(kind) => {
m.complete(p, kind);
@ -68,10 +72,10 @@ pub(crate) fn block(p: &mut Parser) {
// fn foo() { pub 92; } //FIXME
items::MaybeItem::None => {
if has_attrs {
m.abandon(p);
if p.at(LET_KW) {
let_stmt(p);
let_stmt(p, m);
} else {
m.abandon(p);
p.error("expected a let statement");
}
} else {
@ -116,9 +120,8 @@ pub(crate) fn block(p: &mut Parser) {
// let c = 92;
// let d: i32 = 92;
// }
fn let_stmt(p: &mut Parser) {
fn let_stmt(p: &mut Parser, m: Marker) {
assert!(p.at(LET_KW));
let m = p.start();
p.bump();
patterns::pattern(p);
if p.at(COLON) {