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

restore invariatns

Browse source
This commit is contained in:
Aleksey Kladov 2021-12-29 20:37:08 +03:00
parent b5369927d7
commit 2f3237912d
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/parser/src/shortcuts.rs
View file

@ -50,6 +50,7 @@ impl<'a> LexedStr<'a> {
res
}
/// NB: only valid to call with Output from Reparser/TopLevelEntry.
pub fn intersperse_trivia(
&self,
output: &crate::Output,
@ -76,7 +77,7 @@ impl<'a> LexedStr<'a> {
builder.eat_trivias();
(builder.sink)(StrStep::Exit);
}
State::PendingEnter | State::Normal => (),
State::PendingEnter | State::Normal => unreachable!(),
}
let is_eof = builder.pos == builder.lexed.len();
@ -100,8 +101,9 @@ enum State {
impl Builder<'_, '_> {
fn token(&mut self, kind: SyntaxKind, n_tokens: u8) {
match mem::replace(&mut self.state, State::Normal) {
State::PendingEnter => unreachable!(),
State::PendingExit => (self.sink)(StrStep::Exit),
State::PendingEnter | State::Normal => (),
State::Normal => (),
}
self.eat_trivias();
self.do_token(kind, n_tokens as usize);