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

move syntax error to parser

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-20 23:17:07 +03:00
parent 61992dc1cd
commit 882c47f187
6 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ra_syntax/src/parsing.rs
View file

@ -9,7 +9,7 @@ mod grammar;
mod reparsing;
use crate::{
SyntaxError, SyntaxKind, SmolStr,
SyntaxKind, SmolStr, SyntaxError,
parsing::{
builder::GreenBuilder,
input::ParserInput,
@ -21,11 +21,14 @@ use crate::{
pub use self::lexer::{tokenize, Token};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct ParseError(pub String);
pub(crate) use self::reparsing::incremental_reparse;
pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
let tokens = tokenize(&text);
parse_with(GreenBuilder::new(), text, &tokens, grammar::root)
parse_with(GreenBuilder::default(), text, &tokens, grammar::root)
}
fn parse_with<S: TreeSink>(
@ -57,7 +60,7 @@ trait TreeSink {
/// branch as current.
fn finish_branch(&mut self);
fn error(&mut self, error: SyntaxError);
fn error(&mut self, error: ParseError);
/// Complete tree building. Make sure that
/// `start_branch` and `finish_branch` calls