bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
update mapping for element and remove for node
Browse Source
bit-aloo 2 weeks ago
parent ba615ad · commit 640032e
Diffstat
-rw-r--r--crates/syntax/src/syntax_editor/mapping.rs64
1 files changed, 16 insertions, 48 deletions
diff --git a/crates/syntax/src/syntax_editor/mapping.rs b/crates/syntax/src/syntax_editor/mapping.rs
index 464682223c..d6498a5ec9 100644
--- a/crates/syntax/src/syntax_editor/mapping.rs
+++ b/crates/syntax/src/syntax_editor/mapping.rs
@@ -127,55 +127,23 @@ impl SyntaxMapping {
Err(MissingMapping(current))
}
- pub fn upmap_element(
- &self,
- input: &SyntaxElement,
- output_root: &SyntaxNode,
- ) -> Option<Result<SyntaxElement, MissingMapping>> {
- match input {
- SyntaxElement::Node(node) => {
- Some(self.upmap_node(node, output_root)?.map(SyntaxElement::Node))
- }
- SyntaxElement::Token(token) => {
- let upmap_parent = match self.upmap_node(&token.parent().unwrap(), output_root)? {
- Ok(it) => it,
- Err(err) => return Some(Err(err)),
- };
+ pub(super) fn upmap_element(&self, input: &SyntaxElement) -> SyntaxElement {
+ let mut current = input.clone();
- let element = upmap_parent.children_with_tokens().nth(token.index()).unwrap();
- debug_assert!(
- element.as_token().is_some_and(|it| it.kind() == token.kind()),
- "token upmapping mapped to the wrong node ({token:?} -> {element:?})"
- );
-
- Some(Ok(element))
- }
- }
- }
-
- pub fn upmap_node(
- &self,
- input: &SyntaxNode,
- output_root: &SyntaxNode,
- ) -> Option<Result<SyntaxNode, MissingMapping>> {
- // Try to follow the mapping tree, if it exists
- let input_mapping = self.upmap_node_single(input);
- let input_ancestor =
- input.ancestors().find(|ancestor| self.upmap_node_single(ancestor).is_some());
-
- match (input_mapping, input_ancestor) {
- (Some(input_mapping), _) => {
- // A mapping exists at the input, follow along the tree
- Some(self.upmap_child(&input_mapping, &input_mapping, output_root))
- }
- (None, Some(input_ancestor)) => {
- // A mapping exists at an ancestor, follow along the tree
- Some(self.upmap_child(input, &input_ancestor, output_root))
- }
- (None, None) => {
- // No mapping exists at all, is the same position in the final tree
- None
- }
+ loop {
+ let node = match &current {
+ SyntaxElement::Node(node) => node.clone(),
+ SyntaxElement::Token(token) => token.parent().unwrap(),
+ };
+ let Some(input_ancestor) =
+ node.ancestors().find(|ancestor| self.upmap_node_single(ancestor).is_some())
+ else {
+ return current;
+ };
+ let output_ancestor = self.upmap_node_single(&input_ancestor).unwrap();
+ current = self
+ .upmap_child_element(&current, &input_ancestor, &output_ancestor.parent().unwrap())
+ .expect("the nearest mapped ancestor must map its descendants");
}
}