From cd349dbbc4a39342fd54e46fc9d70e3e649a2fda Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 2 Nov 2020 21:40:52 +0100 Subject: Make insert_use return a SyntaxRewriter --- crates/assists/src/handlers/auto_import.rs | 5 +- .../handlers/extract_struct_from_enum_variant.rs | 156 +++++++++------------ .../handlers/replace_qualified_name_with_use.rs | 7 +- crates/assists/src/utils/insert_use.rs | 31 ++-- crates/syntax/src/ast/make.rs | 37 +++++ 5 files changed, 129 insertions(+), 107 deletions(-) (limited to 'crates') diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs index e49e641b3..37dd61266 100644 --- a/crates/assists/src/handlers/auto_import.rs +++ b/crates/assists/src/handlers/auto_import.rs @@ -99,7 +99,6 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()> let range = ctx.sema.original_range(import_assets.syntax_under_caret()).range; let group = import_group_message(import_assets.import_candidate()); let scope = ImportScope::find_insert_use_container(import_assets.syntax_under_caret(), ctx)?; - let syntax = scope.as_syntax_node(); for (import, _) in proposed_imports { acc.add_group( &group, @@ -107,9 +106,9 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()> format!("Import `{}`", &import), range, |builder| { - let new_syntax = + let rewriter = insert_use(&scope, mod_path_to_ast(&import), ctx.config.insert_use.merge); - builder.replace(syntax.text_range(), new_syntax.to_string()) + builder.rewrite(rewriter); }, ); } diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs index 178718c5e..dddab255e 100644 --- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs +++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs @@ -1,16 +1,14 @@ -use hir::{EnumVariant, Module, ModuleDef, Name}; -use ide_db::base_db::FileId; +use hir::{AsName, EnumVariant, Module, ModuleDef, Name}; use ide_db::{defs::Definition, search::Reference, RootDatabase}; -use itertools::Itertools; -use rustc_hash::FxHashSet; +use rustc_hash::{FxHashMap, FxHashSet}; use syntax::{ algo::find_node_at_offset, - ast::{self, edit::IndentLevel, ArgListOwner, AstNode, NameOwner, VisibilityOwner}, - SourceFile, TextRange, TextSize, + algo::SyntaxRewriter, + ast::{self, edit::IndentLevel, make, ArgListOwner, AstNode, NameOwner, VisibilityOwner}, + SourceFile, SyntaxElement, }; use crate::{ - assist_context::AssistBuilder, utils::{insert_use, mod_path_to_ast, ImportScope}, AssistContext, AssistId, AssistKind, Assists, }; @@ -43,7 +41,7 @@ pub(crate) fn extract_struct_from_enum_variant( return None; } - let variant_name = variant.name()?.to_string(); + let variant_name = variant.name()?; let variant_hir = ctx.sema.to_def(&variant)?; if existing_struct_def(ctx.db(), &variant_name, &variant_hir) { return None; @@ -62,14 +60,18 @@ pub(crate) fn extract_struct_from_enum_variant( |builder| { let definition = Definition::ModuleDef(ModuleDef::EnumVariant(variant_hir)); let res = definition.usages(&ctx.sema).all(); - let start_offset = variant.parent_enum().syntax().text_range().start(); + let mut visited_modules_set = FxHashSet::default(); visited_modules_set.insert(current_module); + let mut rewriters = FxHashMap::default(); for reference in res { + let rewriter = rewriters + .entry(reference.file_range.file_id) + .or_insert_with(SyntaxRewriter::default); let source_file = ctx.sema.parse(reference.file_range.file_id); update_reference( ctx, - builder, + rewriter, reference, &source_file, &enum_module_def, @@ -77,34 +79,39 @@ pub(crate) fn extract_struct_from_enum_variant( &mut visited_modules_set, ); } + let mut rewriter = + rewriters.remove(&ctx.frange.file_id).unwrap_or_else(SyntaxRewriter::default); + for (file_id, rewriter) in rewriters { + builder.edit_file(file_id); + builder.rewrite(rewriter); + } + builder.edit_file(ctx.frange.file_id); + update_variant(&mut rewriter, &variant_name, &field_list); extract_struct_def( - builder, + &mut rewriter, &enum_ast, - &variant_name, - &field_list.to_string(), - start_offset, - ctx.frange.file_id, - &visibility, + variant_name.clone(), + &field_list, + &variant.parent_enum().syntax().clone().into(), + visibility, ); - let list_range = field_list.syntax().text_range(); - update_variant(builder, &variant_name, ctx.frange.file_id, list_range); + builder.rewrite(rewriter); }, ) } -fn existing_struct_def(db: &RootDatabase, variant_name: &str, variant: &EnumVariant) -> bool { +fn existing_struct_def(db: &RootDatabase, variant_name: &ast::Name, variant: &EnumVariant) -> bool { variant .parent_enum(db) .module(db) .scope(db, None) .into_iter() - .any(|(name, _)| name.to_string() == variant_name) + .any(|(name, _)| name == variant_name.as_name()) } -#[allow(dead_code)] fn insert_import( ctx: &AssistContext, - builder: &mut AssistBuilder, + rewriter: &mut SyntaxRewriter, path: &ast::PathExpr, module: &Module, enum_module_def: &ModuleDef, @@ -116,69 +123,59 @@ fn insert_import( mod_path.segments.pop(); mod_path.segments.push(variant_hir_name.clone()); let scope = ImportScope::find_insert_use_container(path.syntax(), ctx)?; - let syntax = scope.as_syntax_node(); - let new_syntax = - insert_use(&scope, mod_path_to_ast(&mod_path), ctx.config.insert_use.merge); - // FIXME: this will currently panic as multiple imports will have overlapping text ranges - builder.replace(syntax.text_range(), new_syntax.to_string()) + *rewriter += insert_use(&scope, mod_path_to_ast(&mod_path), ctx.config.insert_use.merge); } Some(()) } -// FIXME: this should use strongly-typed `make`, rather than string manipulation. fn extract_struct_def( - builder: &mut AssistBuilder, + rewriter: &mut SyntaxRewriter, enum_: &ast::Enum, - variant_name: &str, - variant_list: &str, - start_offset: TextSize, - file_id: FileId, - visibility: &Option, + variant_name: ast::Name, + variant_list: &ast::TupleFieldList, + start_offset: &SyntaxElement, + visibility: Option, ) -> Option<()> { - let visibility_string = if let Some(visibility) = visibility { - format!("{} ", visibility.to_string()) - } else { - "".to_string() - }; - let indent = IndentLevel::from_node(enum_.syntax()); - let struct_def = format!( - r#"{}struct {}{}; - -{}"#, - visibility_string, - variant_name, - list_with_visibility(variant_list), - indent + let variant_list = make::tuple_field_list( + variant_list + .fields() + .flat_map(|field| Some(make::tuple_field(Some(make::visibility_pub()), field.ty()?))), ); - builder.edit_file(file_id); - builder.insert(start_offset, struct_def); + + rewriter.insert_before( + start_offset, + make::struct_(visibility, variant_name, None, variant_list.into()).syntax(), + ); + rewriter.insert_before(start_offset, &make::tokens::blank_line()); + + if let indent_level @ 1..=usize::MAX = IndentLevel::from_node(enum_.syntax()).0 as usize { + rewriter + .insert_before(start_offset, &make::tokens::whitespace(&" ".repeat(4 * indent_level))); + } Some(()) } fn update_variant( - builder: &mut AssistBuilder, - variant_name: &str, - file_id: FileId, - list_range: TextRange, + rewriter: &mut SyntaxRewriter, + variant_name: &ast::Name, + field_list: &ast::TupleFieldList, ) -> Option<()> { - let inside_variant_range = TextRange::new( - list_range.start().checked_add(TextSize::from(1))?, - list_range.end().checked_sub(TextSize::from(1))?, - ); - builder.edit_file(file_id); - builder.replace(inside_variant_range, variant_name); + let (l, r): (SyntaxElement, SyntaxElement) = + (field_list.l_paren_token()?.into(), field_list.r_paren_token()?.into()); + let replacement = vec![l, variant_name.syntax().clone().into(), r]; + rewriter.replace_with_many(field_list.syntax(), replacement); Some(()) } fn update_reference( ctx: &AssistContext, - builder: &mut AssistBuilder, + rewriter: &mut SyntaxRewriter, reference: Reference, source_file: &SourceFile, - _enum_module_def: &ModuleDef, - _variant_hir_name: &Name, - _visited_modules_set: &mut FxHashSet, + enum_module_def: &ModuleDef, + variant_hir_name: &Name, + visited_modules_set: &mut FxHashSet, ) -> Option<()> { let path_expr: ast::PathExpr = find_node_at_offset::( source_file.syntax(), @@ -187,35 +184,21 @@ fn update_reference( let call = path_expr.syntax().parent().and_then(ast::CallExpr::cast)?; let list = call.arg_list()?; let segment = path_expr.path()?.segment()?; - let _module = ctx.sema.scope(&path_expr.syntax()).module()?; - let list_range = list.syntax().text_range(); - let inside_list_range = TextRange::new( - list_range.start().checked_add(TextSize::from(1))?, - list_range.end().checked_sub(TextSize::from(1))?, - ); - builder.edit_file(reference.file_range.file_id); - /* FIXME: this most likely requires AST-based editing, see `insert_import` + let module = ctx.sema.scope(&path_expr.syntax()).module()?; if !visited_modules_set.contains(&module) { - if insert_import(ctx, builder, &path_expr, &module, enum_module_def, variant_hir_name) + if insert_import(ctx, rewriter, &path_expr, &module, enum_module_def, variant_hir_name) .is_some() { visited_modules_set.insert(module); } } - */ - builder.replace(inside_list_range, format!("{}{}", segment, list)); - Some(()) -} -fn list_with_visibility(list: &str) -> String { - list.split(',') - .map(|part| { - let index = if part.chars().next().unwrap() == '(' { 1usize } else { 0 }; - let mut mod_part = part.trim().to_string(); - mod_part.insert_str(index, "pub "); - mod_part - }) - .join(", ") + let lparen = syntax::SyntaxElement::from(list.l_paren_token()?); + let rparen = syntax::SyntaxElement::from(list.r_paren_token()?); + rewriter.insert_after(&lparen, segment.syntax()); + rewriter.insert_after(&lparen, &lparen); + rewriter.insert_before(&rparen, &rparen); + Some(()) } #[cfg(test)] @@ -250,7 +233,6 @@ pub enum A { One(One) }"#, } #[test] - #[ignore] // FIXME: this currently panics if `insert_import` is used fn test_extract_struct_with_complex_imports() { check_assist( extract_struct_from_enum_variant, diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/assists/src/handlers/replace_qualified_name_with_use.rs index c50bc7604..d7e1d9580 100644 --- a/crates/assists/src/handlers/replace_qualified_name_with_use.rs +++ b/crates/assists/src/handlers/replace_qualified_name_with_use.rs @@ -45,10 +45,9 @@ pub(crate) fn replace_qualified_name_with_use( // affected (that is, all paths inside the node we added the `use` to). let mut rewriter = SyntaxRewriter::default(); shorten_paths(&mut rewriter, syntax.clone(), &path); - let rewritten_syntax = rewriter.rewrite(&syntax); - if let Some(ref import_scope) = ImportScope::from(rewritten_syntax) { - let new_syntax = insert_use(import_scope, path, ctx.config.insert_use.merge); - builder.replace(syntax.text_range(), new_syntax.to_string()) + if let Some(ref import_scope) = ImportScope::from(syntax.clone()) { + rewriter += insert_use(import_scope, path, ctx.config.insert_use.merge); + builder.rewrite(rewriter); } }, ) diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs index a76bd5ebf..84a0dffdd 100644 --- a/crates/assists/src/utils/insert_use.rs +++ b/crates/assists/src/utils/insert_use.rs @@ -1,12 +1,9 @@ //! Handle syntactic aspects of inserting a new `use`. -use std::{ - cmp::Ordering, - iter::{self, successors}, -}; +use std::{cmp::Ordering, iter::successors}; use itertools::{EitherOrBoth, Itertools}; use syntax::{ - algo, + algo::SyntaxRewriter, ast::{ self, edit::{AstNodeEdit, IndentLevel}, @@ -88,20 +85,19 @@ impl ImportScope { } /// Insert an import path into the given file/node. A `merge` value of none indicates that no import merging is allowed to occur. -pub(crate) fn insert_use( +pub(crate) fn insert_use<'a>( scope: &ImportScope, path: ast::Path, merge: Option, -) -> SyntaxNode { +) -> SyntaxRewriter<'a> { + let mut rewriter = SyntaxRewriter::default(); let use_item = make::use_(make::use_tree(path.clone(), None, None, false)); // merge into existing imports if possible if let Some(mb) = merge { for existing_use in scope.as_syntax_node().children().filter_map(ast::Use::cast) { if let Some(merged) = try_merge_imports(&existing_use, &use_item, mb) { - let to_delete: SyntaxElement = existing_use.syntax().clone().into(); - let to_delete = to_delete.clone()..=to_delete; - let to_insert = iter::once(merged.syntax().clone().into()); - return algo::replace_children(scope.as_syntax_node(), to_delete, to_insert); + rewriter.replace(existing_use.syntax(), merged.syntax()); + return rewriter; } } } @@ -157,7 +153,15 @@ pub(crate) fn insert_use( buf }; - algo::insert_children(scope.as_syntax_node(), insert_position, to_insert) + match insert_position { + InsertPosition::First => { + rewriter.insert_many_as_first_children(scope.as_syntax_node(), to_insert) + } + InsertPosition::Last => return rewriter, // actually unreachable + InsertPosition::Before(anchor) => rewriter.insert_many_before(&anchor, to_insert), + InsertPosition::After(anchor) => rewriter.insert_many_after(&anchor, to_insert), + } + rewriter } fn eq_visibility(vis0: Option, vis1: Option) -> bool { @@ -1101,7 +1105,8 @@ use foo::bar::baz::Qux;", .find_map(ast::Path::cast) .unwrap(); - let result = insert_use(&file, path, mb).to_string(); + let rewriter = insert_use(&file, path, mb); + let result = rewriter.rewrite(file.as_syntax_node()).to_string(); assert_eq_text!(&result, ra_fixture_after); } diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs index 5b06cb767..2cf436e7a 100644 --- a/crates/syntax/src/ast/make.rs +++ b/crates/syntax/src/ast/make.rs @@ -351,6 +351,23 @@ pub fn visibility_pub_crate() -> ast::Visibility { ast_from_text("pub(crate) struct S") } +pub fn visibility_pub() -> ast::Visibility { + ast_from_text("pub struct S") +} + +pub fn tuple_field_list(fields: impl IntoIterator) -> ast::TupleFieldList { + let fields = fields.into_iter().join(", "); + ast_from_text(&format!("struct f({});", fields)) +} + +pub fn tuple_field(visibility: Option, ty: ast::Type) -> ast::TupleField { + let visibility = match visibility { + None => String::new(), + Some(it) => format!("{} ", it), + }; + ast_from_text(&format!("struct f({}{});", visibility, ty)) +} + pub fn fn_( visibility: Option, fn_name: ast::Name, @@ -373,6 +390,26 @@ pub fn fn_( )) } +pub fn struct_( + visibility: Option, + strukt_name: ast::Name, + type_params: Option, + field_list: ast::FieldList, +) -> ast::Struct { + let semicolon = if matches!(field_list, ast::FieldList::TupleFieldList(_)) { ";" } else { "" }; + let type_params = + if let Some(type_params) = type_params { format!("<{}>", type_params) } else { "".into() }; + let visibility = match visibility { + None => String::new(), + Some(it) => format!("{} ", it), + }; + + ast_from_text(&format!( + "{}struct {}{}{}{}", + visibility, strukt_name, type_params, field_list, semicolon + )) +} + fn ast_from_text(text: &str) -> N { let parse = SourceFile::parse(text); let node = match parse.tree().syntax().descendants().find_map(N::cast) { -- cgit v1.2.3