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

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

21
crates/ra_syntax/src/parsing/reparsing.rs
View file

@ -1,18 +1,18 @@
use ra_text_edit::AtomTextEdit;
use ra_parser::Reparser;
use crate::{
SyntaxKind::*, TextRange, TextUnit,
algo,
syntax_node::{GreenNode, SyntaxNode},
syntax_error::SyntaxError,
parsing::{
grammar, parse_with,
input::ParserInput,
builder::TreeBuilder,
parser::Parser,
lexer::{tokenize, Token},
}
};
use ra_text_edit::AtomTextEdit;
pub(crate) fn incremental_reparse(
node: &SyntaxNode,
edit: &AtomTextEdit,
@ -61,8 +61,10 @@ fn reparse_block<'node>(
if !is_balanced(&tokens) {
return None;
}
let tree_sink = TreeBuilder::new(&text, &tokens);
let (green, new_errors) = parse_with(tree_sink, &text, &tokens, reparser);
let token_source = ParserInput::new(&text, &tokens);
let mut tree_sink = TreeBuilder::new(&text, &tokens);
reparser.parse(&token_source, &mut tree_sink);
let (green, new_errors) = tree_sink.finish();
Some((node, green, new_errors))
}
@ -78,15 +80,12 @@ fn is_contextual_kw(text: &str) -> bool {
}
}
fn find_reparsable_node(
node: &SyntaxNode,
range: TextRange,
) -> Option<(&SyntaxNode, fn(&mut Parser))> {
fn find_reparsable_node(node: &SyntaxNode, range: TextRange) -> Option<(&SyntaxNode, Reparser)> {
let node = algo::find_covering_node(node, range);
node.ancestors().find_map(|node| {
let first_child = node.first_child().map(|it| it.kind());
let parent = node.parent().map(|it| it.kind());
grammar::reparser(node.kind(), first_child, parent).map(|r| (node, r))
Reparser::for_node(node.kind(), first_child, parent).map(|r| (node, r))
})
}