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

Fix panic in split and merge import assists

Browse source
This commit is contained in:
Laurențiu Nicola 2020-06-23 09:41:43 +03:00
parent 98c3e4e887
commit 76ddface08
7 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_parser/src/grammar/paths.rs
View file

@ -73,8 +73,10 @@ fn path_segment(p: &mut Parser, mode: Mode, first: bool) {
}
p.expect(T![>]);
} else {
let mut empty = true;
if first {
p.eat(T![::]);
empty = false;
}
match p.current() {
IDENT => {
@ -86,6 +88,12 @@ fn path_segment(p: &mut Parser, mode: Mode, first: bool) {
T![self] | T![super] | T![crate] => p.bump_any(),
_ => {
p.err_recover("expected identifier", items::ITEM_RECOVERY_SET);
if empty {
// test_err empty_segment
// use crate::;
m.abandon(p);
return;
}
}
};
}