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

internal: Standardize how we take iterator parameters in SyntaxFactory

Browse source
This commit is contained in:
Giga Bowser 2024-12-18 11:03:19 -05:00
parent 27fac08c82
commit 2b6e7ce896
1 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/syntax/src/ast/syntax_factory/constructors.rs
View file

@ -1,6 +1,4 @@
//! Wrappers over [`make`] constructors //! Wrappers over [`make`] constructors
use itertools::Itertools;
use crate::{ use crate::{
ast::{self, make, HasGenericParams, HasName, HasTypeBounds, HasVisibility}, ast::{self, make, HasGenericParams, HasName, HasTypeBounds, HasVisibility},
syntax_editor::SyntaxMappingBuilder, syntax_editor::SyntaxMappingBuilder,
@ -62,13 +60,12 @@ impl SyntaxFactory {
pub fn block_expr( pub fn block_expr(
&self, &self,
stmts: impl IntoIterator<Item = ast::Stmt>, statements: impl IntoIterator<Item = ast::Stmt>,
tail_expr: Option<ast::Expr>, tail_expr: Option<ast::Expr>,
) -> ast::BlockExpr { ) -> ast::BlockExpr {
let stmts = stmts.into_iter().collect_vec(); let (statements, mut input) = iterator_input(statements);
let mut input = stmts.iter().map(|it| it.syntax().clone()).collect_vec();
let ast = make::block_expr(stmts, tail_expr.clone()).clone_for_update(); let ast = make::block_expr(statements, tail_expr.clone()).clone_for_update();
if let Some(mut mapping) = self.mappings() { if let Some(mut mapping) = self.mappings() {
let stmt_list = ast.stmt_list().unwrap(); let stmt_list = ast.stmt_list().unwrap();
@ -257,14 +254,15 @@ impl SyntaxFactory {
pub fn turbofish_generic_arg_list( pub fn turbofish_generic_arg_list(
&self, &self,
args: impl IntoIterator<Item = ast::GenericArg> + Clone, generic_args: impl IntoIterator<Item = ast::GenericArg>,
) -> ast::GenericArgList { ) -> ast::GenericArgList {
let ast = make::turbofish_generic_arg_list(args.clone()).clone_for_update(); let (generic_args, input) = iterator_input(generic_args);
let ast = make::turbofish_generic_arg_list(generic_args.clone()).clone_for_update();
if let Some(mut mapping) = self.mappings() { if let Some(mut mapping) = self.mappings() {
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone()); let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
builder.map_children( builder.map_children(
args.into_iter().map(|arg| arg.syntax().clone()), input.into_iter(),
ast.generic_args().map(|arg| arg.syntax().clone()), ast.generic_args().map(|arg| arg.syntax().clone()),
); );
builder.finish(&mut mapping); builder.finish(&mut mapping);
@ -277,8 +275,7 @@ impl SyntaxFactory {
&self, &self,
fields: impl IntoIterator<Item = ast::RecordField>, fields: impl IntoIterator<Item = ast::RecordField>,
) -> ast::RecordFieldList { ) -> ast::RecordFieldList {
let fields: Vec<ast::RecordField> = fields.into_iter().collect(); let (fields, input) = iterator_input(fields);
let input: Vec<_> = fields.iter().map(|it| it.syntax().clone()).collect();
let ast = make::record_field_list(fields).clone_for_update(); let ast = make::record_field_list(fields).clone_for_update();
if let Some(mut mapping) = self.mappings() { if let Some(mut mapping) = self.mappings() {
@ -323,8 +320,7 @@ impl SyntaxFactory {
&self, &self,
fields: impl IntoIterator<Item = ast::TupleField>, fields: impl IntoIterator<Item = ast::TupleField>,
) -> ast::TupleFieldList { ) -> ast::TupleFieldList {
let fields: Vec<ast::TupleField> = fields.into_iter().collect(); let (fields, input) = iterator_input(fields);
let input: Vec<_> = fields.iter().map(|it| it.syntax().clone()).collect();
let ast = make::tuple_field_list(fields).clone_for_update(); let ast = make::tuple_field_list(fields).clone_for_update();
if let Some(mut mapping) = self.mappings() { if let Some(mut mapping) = self.mappings() {
@ -419,8 +415,7 @@ impl SyntaxFactory {
&self, &self,
variants: impl IntoIterator<Item = ast::Variant>, variants: impl IntoIterator<Item = ast::Variant>,
) -> ast::VariantList { ) -> ast::VariantList {
let variants: Vec<ast::Variant> = variants.into_iter().collect(); let (variants, input) = iterator_input(variants);
let input: Vec<_> = variants.iter().map(|it| it.syntax().clone()).collect();
let ast = make::variant_list(variants).clone_for_update(); let ast = make::variant_list(variants).clone_for_update();
if let Some(mut mapping) = self.mappings() { if let Some(mut mapping) = self.mappings() {
@ -481,7 +476,7 @@ impl SyntaxFactory {
pub fn token_tree( pub fn token_tree(
&self, &self,
delimiter: SyntaxKind, delimiter: SyntaxKind,
tt: Vec<NodeOrToken<ast::TokenTree, SyntaxToken>>, tt: impl IntoIterator<Item = NodeOrToken<ast::TokenTree, SyntaxToken>>,
) -> ast::TokenTree { ) -> ast::TokenTree {
let tt: Vec<_> = tt.into_iter().collect(); let tt: Vec<_> = tt.into_iter().collect();
let input: Vec<_> = tt.iter().cloned().filter_map(only_nodes).collect(); let input: Vec<_> = tt.iter().cloned().filter_map(only_nodes).collect();
@ -512,3 +507,20 @@ impl SyntaxFactory {
make::tokens::whitespace(text) make::tokens::whitespace(text)
} }
} }
// We need to collect `input` here instead of taking `impl IntoIterator + Clone`,
// because if we took `impl IntoIterator + Clone`, that could be something like an
// `Iterator::map` with a closure that also makes use of a `SyntaxFactory` constructor.
//
// In that case, the iterator would be evaluated inside of the call to `map_children`,
// and the inner constructor would try to take a mutable borrow of the mappings `RefCell`,
// which would panic since it's already being mutably borrowed in the outer constructor.
fn iterator_input<N: AstNode>(input: impl IntoIterator<Item = N>) -> (Vec<N>, Vec<SyntaxNode>) {
input
.into_iter()
.map(|it| {
let syntax = it.syntax().clone();
(it, syntax)
})
.collect()
}