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

Replace expressions with errors in them

Browse source
This commit is contained in:
Florian Diebold 2022-02-09 11:58:52 +01:00
parent 30287e6051
commit ecf3cff4a6
7 changed files with 84 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/mbe/src/syntax_bridge.rs
View file

@ -30,8 +30,8 @@ pub fn syntax_node_to_token_tree_censored(
let mut c = Convertor::new(node, global_offset, replace, append);
let subtree = convert_tokens(&mut c);
c.id_alloc.map.shrink_to_fit();
always!(c.replace.is_empty());
always!(c.append.is_empty());
always!(c.replace.is_empty(), "replace: {:?}", c.replace);
always!(c.append.is_empty(), "append: {:?}", c.append);
(subtree, c.id_alloc.map)
}
@ -539,7 +539,6 @@ impl Convertor {
WalkEvent::Enter(ele) => ele,
WalkEvent::Leave(SyntaxElement::Node(node)) => {
if let Some(mut v) = append.remove(&node) {
eprintln!("after {:?}, appending {:?}", node, v);
if !v.is_empty() {
v.reverse();
return (None, v);
@ -554,7 +553,6 @@ impl Convertor {
SyntaxElement::Node(node) => {
if let Some(mut v) = replace.remove(&node) {
preorder.skip_subtree();
eprintln!("replacing {:?} by {:?}", node, v);
if !v.is_empty() {
v.reverse();
return (None, v);
@ -640,8 +638,8 @@ impl TokenConvertor for Convertor {
self.current = new_current;
self.current_synthetic = new_synth;
}
// TODO fix range?
return Some((SynToken::Synthetic(synth_token), self.range));
let range = synth_token.range;
return Some((SynToken::Synthetic(synth_token), range));
}
let curr = self.current.clone()?;
@ -675,7 +673,6 @@ impl TokenConvertor for Convertor {
}
if let Some(synth_token) = self.current_synthetic.last() {
// TODO fix range?
return Some(SynToken::Synthetic(synth_token.clone()));
}