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

internal: replace TreeSink with a data structure

Browse source 
The general theme of this is to make parser a better independent
library.

The specific thing we do here is replacing callback based TreeSink with
a data structure. That is, rather than calling user-provided tree
construction methods, the parser now spits out a very bare-bones tree,
effectively a log of a DFS traversal.

This makes the parser usable without any *specifc* tree sink, and allows
us to, eg, move tests into this crate.

Now, it's also true that this is a distinction without a difference, as
the old and the new interface are equivalent in expressiveness. Still,
this new thing seems somewhat simpler. But yeah, I admit I don't have a
suuper strong motivation here, just a hunch that this is better.
This commit is contained in:
Aleksey Kladov 2021-12-19 17:36:23 +03:00
parent 2f63558dc5
commit d0d05075ed
10 changed files with 172 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/syntax/src/parsing/reparsing.rs
View file

@ -10,7 +10,7 @@ use parser::Reparser;
use text_edit::Indel;
use crate::{
parsing::text_tree_sink::TextTreeSink,
parsing::text_tree_sink::build_tree,
syntax_node::{GreenNode, GreenToken, NodeOrToken, SyntaxElement, SyntaxNode},
SyntaxError,
SyntaxKind::*,
@ -94,11 +94,9 @@ fn reparse_block(
return None;
}
let mut tree_sink = TextTreeSink::new(lexed);
let tree_traversal = reparser.parse(&parser_tokens);
reparser.parse(&parser_tokens, &mut tree_sink);
let (green, new_parser_errors) = tree_sink.finish();
let (green, new_parser_errors, _eof) = build_tree(lexed, tree_traversal, false);
Some((node.replace_with(green), new_parser_errors, node.text_range()))
}