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

Reduce visibility

Browse source
This commit is contained in:
Florian Diebold 2022-02-09 17:43:37 +01:00
parent dfd2cef0d0
commit 577f70cc9c
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/hir_expand/src/fixup.rs
View file

@ -14,12 +14,12 @@ use tt::Subtree;
/// (appending to and replacing nodes), the information that is needed to /// (appending to and replacing nodes), the information that is needed to
/// reverse those changes afterwards, and a token map. /// reverse those changes afterwards, and a token map.
#[derive(Debug)] #[derive(Debug)]
pub struct SyntaxFixups { pub(crate) struct SyntaxFixups {
pub append: FxHashMap<SyntaxNode, Vec<SyntheticToken>>, pub(crate) append: FxHashMap<SyntaxNode, Vec<SyntheticToken>>,
pub replace: FxHashMap<SyntaxNode, Vec<SyntheticToken>>, pub(crate) replace: FxHashMap<SyntaxNode, Vec<SyntheticToken>>,
pub undo_info: SyntaxFixupUndoInfo, pub(crate) undo_info: SyntaxFixupUndoInfo,
pub token_map: TokenMap, pub(crate) token_map: TokenMap,
pub next_id: u32, pub(crate) next_id: u32,
} }
/// This is the information needed to reverse the fixups. /// This is the information needed to reverse the fixups.
@ -30,7 +30,7 @@ pub struct SyntaxFixupUndoInfo {
const EMPTY_ID: SyntheticTokenId = SyntheticTokenId(!0); const EMPTY_ID: SyntheticTokenId = SyntheticTokenId(!0);
pub fn fixup_syntax(node: &SyntaxNode) -> SyntaxFixups { pub(crate) fn fixup_syntax(node: &SyntaxNode) -> SyntaxFixups {
let mut append = FxHashMap::default(); let mut append = FxHashMap::default();
let mut replace = FxHashMap::default(); let mut replace = FxHashMap::default();
let mut preorder = node.preorder(); let mut preorder = node.preorder();
@ -122,7 +122,7 @@ fn has_error_to_handle(node: &SyntaxNode) -> bool {
has_error(node) || node.children().any(|c| !can_handle_error(&c) && has_error_to_handle(&c)) has_error(node) || node.children().any(|c| !can_handle_error(&c) && has_error_to_handle(&c))
} }
pub fn reverse_fixups(tt: &mut Subtree, token_map: &TokenMap, undo_info: &SyntaxFixupUndoInfo) { pub(crate) fn reverse_fixups(tt: &mut Subtree, token_map: &TokenMap, undo_info: &SyntaxFixupUndoInfo) {
tt.token_trees.retain(|tt| match tt { tt.token_trees.retain(|tt| match tt {
tt::TokenTree::Leaf(leaf) => { tt::TokenTree::Leaf(leaf) => {
token_map.synthetic_token_id(leaf.id()).is_none() token_map.synthetic_token_id(leaf.id()).is_none()