bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/syntax/src/ast/syntax_factory/constructors.rs')
-rw-r--r--crates/syntax/src/ast/syntax_factory/constructors.rs37
1 files changed, 26 insertions, 11 deletions
diff --git a/crates/syntax/src/ast/syntax_factory/constructors.rs b/crates/syntax/src/ast/syntax_factory/constructors.rs
index ad67abfbed..421d13f0dc 100644
--- a/crates/syntax/src/ast/syntax_factory/constructors.rs
+++ b/crates/syntax/src/ast/syntax_factory/constructors.rs
@@ -96,7 +96,9 @@ impl SyntaxFactory {
if let Some(mut mapping) = self.mappings() {
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
- builder.map_children(input, ast.bounds().map(|b| b.syntax().clone()));
+ for (input_node, output_bound) in input.into_iter().zip(ast.bounds()) {
+ builder.map_node(input_node, output_bound.syntax().clone());
+ }
builder.finish(&mut mapping);
}
@@ -209,7 +211,7 @@ impl SyntaxFactory {
}
builder.map_children(
params_input,
- ast.param_list().unwrap().params().map(|p| p.syntax().clone()),
+ ast.syntax().children().filter(|c| ast::Param::can_cast(c.kind())),
);
if let Some(ret_type) = ret_type {
builder
@@ -242,13 +244,17 @@ impl SyntaxFactory {
builder.map_node(ty.syntax().clone(), ast.ty().unwrap().syntax().clone());
}
}
+ builder.finish(&mut mapping);
+
if let Some(type_bound_list) = ast.type_bound_list() {
- builder.map_children(
+ let mut bounds_builder =
+ SyntaxMappingBuilder::new(type_bound_list.syntax().clone());
+ bounds_builder.map_children(
bounds_input,
type_bound_list.bounds().map(|b| b.syntax().clone()),
);
+ bounds_builder.finish(&mut mapping);
}
- builder.finish(&mut mapping);
}
ast
@@ -484,11 +490,13 @@ impl SyntaxFactory {
if let Some(mut mapping) = self.mappings() {
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
builder.map_node(name_ref.syntax().clone(), ast.name_ref().unwrap().syntax().clone());
- builder.map_children(
- input,
- ast.generic_arg_list().unwrap().generic_args().map(|a| a.syntax().clone()),
- );
builder.finish(&mut mapping);
+
+ let generic_arg_list = ast.generic_arg_list().unwrap();
+ let mut arg_builder = SyntaxMappingBuilder::new(generic_arg_list.syntax().clone());
+ arg_builder
+ .map_children(input, generic_arg_list.generic_args().map(|a| a.syntax().clone()));
+ arg_builder.finish(&mut mapping);
}
ast
@@ -629,9 +637,16 @@ impl SyntaxFactory {
let ast = make::path_from_segments(segments, is_abs).clone_for_update();
if let Some(mut mapping) = self.mappings() {
- let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
- builder.map_children(input, ast.segments().map(|it| it.syntax().clone()));
- builder.finish(&mut mapping);
+ let mut current_path = Some(ast.clone());
+ for input_segment in input.iter().rev() {
+ let Some(path) = current_path else { break };
+ if let Some(segment) = path.segment() {
+ let mut builder = SyntaxMappingBuilder::new(path.syntax().clone());
+ builder.map_node(input_segment.clone(), segment.syntax().clone());
+ builder.finish(&mut mapping);
+ }
+ current_path = path.qualifier();
+ }
}
ast