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

Refactor

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-25 12:10:35 +03:00
parent a44428fc79
commit 87cd57d56a
3 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/libsyntax2/src/lib.rs
View file

@ -50,16 +50,25 @@ pub use {
yellow::{SyntaxNode, SyntaxNodeRef, OwnedRoot, RefRoot, TreeRoot, SyntaxError},
};
use yellow::{GreenNode, SyntaxRoot};
#[derive(Clone, Debug)]
pub struct File {
root: SyntaxNode
}
impl File {
pub fn parse(text: &str) -> Self {
let root = ::parse(text);
fn new(root: GreenNode, errors: Vec<SyntaxError>) -> File {
let root = SyntaxRoot::new(root, errors);
let root = SyntaxNode::new_owned(root);
validate_block_structure(root.borrowed());
File { root }
}
pub fn parse(text: &str) -> Self {
let tokens = tokenize(&text);
let (root, errors) = parser_impl::parse::<yellow::GreenBuilder>(text, &tokens);
File::new(root, errors)
}
pub fn ast(&self) -> ast::Root {
ast::Root::cast(self.syntax()).unwrap()
}
@ -69,14 +78,6 @@ impl File {
pub fn errors(&self) -> Vec<SyntaxError> {
self.syntax().root.syntax_root().errors.clone()
}
}
pub fn parse(text: &str) -> SyntaxNode {
let tokens = tokenize(&text);
let res = parser_impl::parse::<yellow::GreenBuilder>(text, &tokens);
validate_block_structure(res.borrowed());
res
}
#[cfg(not(debug_assertions))]