language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Parse unsafe async / const unsafe fns properly

Browse source
This commit is contained in:
robojumper 2019-04-03 17:11:56 +02:00
parent c6c88070c4
commit 636270f4a4
5 changed files with 95 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/ra_parser/src/grammar/items.rs
View file

@ -79,19 +79,22 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
let mut has_mods = false;
// modifiers
// test_err async_without_semicolon
// fn foo() { let _ = async {} }
has_mods |= p.eat(CONST_KW);
if p.at(ASYNC_KW) && p.nth(1) != L_CURLY && p.nth(1) != MOVE_KW && p.nth(1) != PIPE {
p.eat(ASYNC_KW);
has_mods = true;
}
// test_err unsafe_block_in_mod
// fn foo(){} unsafe { } fn bar(){}
if p.at(UNSAFE_KW) && p.nth(1) != L_CURLY {
p.eat(UNSAFE_KW);
has_mods = true;
}
// test_err async_without_semicolon
// fn foo() { let _ = async {} }
if p.at(ASYNC_KW) && p.nth(1) != L_CURLY && p.nth(1) != MOVE_KW && p.nth(1) != PIPE {
p.eat(ASYNC_KW);
has_mods = true;
}
if p.at(EXTERN_KW) {
has_mods = true;
abi(p);
@ -124,6 +127,14 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
// test unsafe_fn
// unsafe fn foo() {}
// test combined_fns
// unsafe async fn foo() {}
// const unsafe fn bar() {}
// test_err wrong_order_fns
// async unsafe fn foo() {}
// unsafe const fn bar() {}
FN_KW => {
fn_def(p, flavor);
m.complete(p, FN_DEF);