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

Refactor SubtreeSource

Browse source
This commit is contained in:
Edwin Cheng 2019-05-23 02:00:34 +08:00
parent 4d7a567bc5
commit dd50ca7c5e
3 changed files with 89 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_mbe/src/subtree_parser.rs
View file

@ -2,6 +2,7 @@ use crate::subtree_source::SubtreeTokenSource;
use ra_parser::{TokenSource, TreeSink};
use ra_syntax::{SyntaxKind};
use tt::buffer::TokenBuffer;
struct OffsetTokenSink {
token_pos: usize,
@ -69,7 +70,8 @@ impl<'a> Parser<'a> {
where
F: FnOnce(&dyn TokenSource, &mut dyn TreeSink),
{
let mut src = SubtreeTokenSource::new(&self.subtree.token_trees[*self.cur_pos..]);
let buffer = TokenBuffer::new(&self.subtree.token_trees[*self.cur_pos..]);
let mut src = SubtreeTokenSource::new(&buffer);
let mut sink = OffsetTokenSink { token_pos: 0, error: false };
f(&src, &mut sink);
@ -85,7 +87,7 @@ impl<'a> Parser<'a> {
let res = src.bump_n(parsed_token);
*self.cur_pos += res.len();
let res: Vec<_> = res.into_iter().cloned().collect();
let res: Vec<_> = res.into_iter().collect();
match res.len() {
0 => None,