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

fix compilation

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-21 13:37:32 +03:00
parent d334b5a1db
commit c47f9e2d37
9 changed files with 39 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_syntax/src/parsing/builder.rs
View file

@ -1,7 +1,9 @@
use ra_parser::{TreeSink, ParseError};
use crate::{
SmolStr, SyntaxError, SyntaxErrorKind, TextUnit, TextRange,
SyntaxKind::{self, *},
parsing::{TreeSink, ParseError, Token},
parsing::Token,
syntax_node::{GreenNode, RaTypes},
};
@ -17,8 +19,6 @@ pub(crate) struct TreeBuilder<'a> {
}
impl<'a> TreeSink for TreeBuilder<'a> {
type Tree = (GreenNode, Vec<SyntaxError>);
fn leaf(&mut self, kind: SyntaxKind, n_tokens: u8) {
self.eat_trivias();
let n_tokens = n_tokens as usize;
@ -65,10 +65,6 @@ impl<'a> TreeSink for TreeBuilder<'a> {
let error = SyntaxError::new(SyntaxErrorKind::ParseError(error), self.text_pos);
self.errors.push(error)
}
fn finish(self) -> (GreenNode, Vec<SyntaxError>) {
(self.inner.finish(), self.errors)
}
}
impl<'a> TreeBuilder<'a> {
@ -82,6 +78,11 @@ impl<'a> TreeBuilder<'a> {
inner: GreenNodeBuilder::new(),
}
}
pub(super) fn finish(self) -> (GreenNode, Vec<SyntaxError>) {
(self.inner.finish(), self.errors)
}
fn eat_trivias(&mut self) {
while let Some(&token) = self.tokens.get(self.token_pos) {
if !token.kind.is_trivia() {