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

Remove skip Delimiter::None and handle Dollars

Browse source
This commit is contained in:
Edwin Cheng 2019-04-13 01:50:05 +08:00
parent 74e846b9ec
commit f66300ccd1
5 changed files with 256 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_parser/src/parser.rs
View file

@ -99,6 +99,8 @@ impl<'t> Parser<'t> {
/// consumed between the `start` and the corresponding `Marker::complete`
/// belong to the same node.
pub(crate) fn start(&mut self) -> Marker {
self.eat_dollars();
let pos = self.events.len() as u32;
self.push_event(Event::tombstone());
Marker::new(pos)
@ -180,13 +182,23 @@ impl<'t> Parser<'t> {
}
fn do_bump(&mut self, kind: SyntaxKind, n_raw_tokens: u8) {
self.eat_dollars();
self.token_pos += usize::from(n_raw_tokens);
self.push_event(Event::Token { kind, n_raw_tokens });
self.eat_dollars();
}
fn push_event(&mut self, event: Event) {
self.events.push(event)
}
fn eat_dollars(&mut self) {
while self.nth(0) == SyntaxKind::L_DOLLAR || self.nth(0) == SyntaxKind::R_DOLLAR {
let kind = self.nth(0);
self.token_pos += 1;
self.push_event(Event::Token { kind, n_raw_tokens: 1 });
}
}
}
/// See `Parser::start`.