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

Ignore outermost non-delimited Subtree when reversing fixups

Browse source
This commit is contained in:
Ryo Yoshida 2022-11-10 19:22:20 +09:00
parent 41b0c54c07
commit 4f415fc348
No known key found for this signature in database
GPG key ID: E25698A930586171
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
crates/hir-expand/src/fixup.rs
View file

@ -4,6 +4,7 @@ use std::mem;
use mbe::{SyntheticToken, SyntheticTokenId, TokenMap}; use mbe::{SyntheticToken, SyntheticTokenId, TokenMap};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use smallvec::SmallVec;
use syntax::{ use syntax::{
ast::{self, AstNode, HasLoopBody}, ast::{self, AstNode, HasLoopBody},
match_ast, SyntaxElement, SyntaxKind, SyntaxNode, TextRange, match_ast, SyntaxElement, SyntaxKind, SyntaxNode, TextRange,
@ -292,21 +293,34 @@ pub(crate) fn reverse_fixups(
token_map: &TokenMap, token_map: &TokenMap,
undo_info: &SyntaxFixupUndoInfo, undo_info: &SyntaxFixupUndoInfo,
) { ) {
tt.token_trees.retain(|tt| match tt { let tts = std::mem::take(&mut tt.token_trees);
tt::TokenTree::Leaf(leaf) => token_map.synthetic_token_id(leaf.id()) != Some(EMPTY_ID), tt.token_trees = tts
tt::TokenTree::Subtree(st) => { .into_iter()
st.delimiter.map_or(true, |d| token_map.synthetic_token_id(d.id) != Some(EMPTY_ID)) .filter(|tt| match tt {
} tt::TokenTree::Leaf(leaf) => token_map.synthetic_token_id(leaf.id()) != Some(EMPTY_ID),
}); tt::TokenTree::Subtree(st) => {
tt.token_trees.iter_mut().for_each(|tt| match tt { st.delimiter.map_or(true, |d| token_map.synthetic_token_id(d.id) != Some(EMPTY_ID))
tt::TokenTree::Subtree(tt) => reverse_fixups(tt, token_map, undo_info),
tt::TokenTree::Leaf(leaf) => {
if let Some(id) = token_map.synthetic_token_id(leaf.id()) {
let original = &undo_info.original[id.0 as usize];
*tt = tt::TokenTree::Subtree(original.clone());
} }
} })
}); .flat_map(|tt| match tt {
tt::TokenTree::Subtree(mut tt) => {
reverse_fixups(&mut tt, token_map, undo_info);
SmallVec::from_const([tt.into()])
}
tt::TokenTree::Leaf(leaf) => {
if let Some(id) = token_map.synthetic_token_id(leaf.id()) {
let original = undo_info.original[id.0 as usize].clone();
if original.delimiter.is_none() {
original.token_trees.into()
} else {
SmallVec::from_const([original.into()])
}
} else {
SmallVec::from_const([leaf.into()])
}
}
})
.collect();
} }
#[cfg(test)] #[cfg(test)]