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

better error recovery for use trees

Browse source
This commit is contained in:
Aleksey Kladov 2019-09-05 19:53:07 +03:00
parent edc2016f8b
commit b2be998b7b
5 changed files with 65 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ pub(super) enum ItemFlavor {
pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![
FN_KW, STRUCT_KW, ENUM_KW, IMPL_KW, TRAIT_KW, CONST_KW, STATIC_KW, LET_KW, MOD_KW, PUB_KW,
CRATE_KW
CRATE_KW, USE_KW
];
pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool, flavor: ItemFlavor) {

5
crates/ra_parser/src/grammar/items/use_item.rs
View file

@ -101,7 +101,10 @@ fn use_tree(p: &mut Parser) {
}
_ => {
m.abandon(p);
p.err_and_bump("expected one of `*`, `::`, `{`, `self`, `super` or an indentifier");
p.err_recover(
"expected one of `*`, `::`, `{`, `self`, `super` or an identifier",
ITEM_RECOVERY_SET,
);
return;
}
}