Skip to content

Commit

Permalink
Auto merge of rust-lang#13333 - feniljain:fix_assists, r=Veykril
Browse files Browse the repository at this point in the history
fix(generate_method): correct method indentation inside generated impl and change gen loc

should fix rust-lang#10619
  • Loading branch information
bors committed Oct 10, 2022
2 parents dcf1d71 + 37ff07e commit 3a69435
Showing 1 changed file with 52 additions and 61 deletions.
113 changes: 52 additions & 61 deletions crates/ide-assists/src/handlers/generate_function.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use hir::{HasSource, HirDisplay, Module, Semantics, TypeInfo};
use hir::{Adt, HasSource, HirDisplay, Module, Semantics, TypeInfo};
use ide_db::{
base_db::FileId,
defs::{Definition, NameRefClass},
Expand Down Expand Up @@ -145,7 +145,8 @@ fn gen_method(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
return None;
}
let (impl_, file) = get_adt_source(ctx, &adt, fn_name.text().as_str())?;
let (target, insert_offset) = get_method_target(ctx, &target_module, &impl_)?;
let (target, insert_offset) = get_method_target(ctx, &impl_, &adt)?;

let function_builder =
FunctionBuilder::from_method_call(ctx, &call, &fn_name, target_module, target)?;
let text_range = call.syntax().text_range();
Expand Down Expand Up @@ -174,10 +175,11 @@ fn add_func_to_accumulator(
label: String,
) -> Option<()> {
acc.add(AssistId("generate_function", AssistKind::Generate), label, text_range, |builder| {
let function_template = function_builder.render();
let indent = IndentLevel::from_node(function_builder.target.syntax());
let function_template = function_builder.render(adt_name.is_some());
let mut func = function_template.to_string(ctx.config.snippet_cap);
if let Some(name) = adt_name {
func = format!("\nimpl {} {{\n{}\n}}", name, func);
func = format!("\n{}impl {} {{\n{}\n{}}}", indent, name, func, indent);
}
builder.edit_file(file);
match ctx.config.snippet_cap {
Expand Down Expand Up @@ -307,7 +309,7 @@ impl FunctionBuilder {
})
}

fn render(self) -> FunctionTemplate {
fn render(self, is_method: bool) -> FunctionTemplate {
let placeholder_expr = make::ext::expr_todo();
let fn_body = make::block_expr(vec![], Some(placeholder_expr));
let visibility = if self.needs_pub { Some(make::visibility_pub_crate()) } else { None };
Expand All @@ -325,8 +327,14 @@ impl FunctionBuilder {

match self.target {
GeneratedFunctionTarget::BehindItem(it) => {
let indent = IndentLevel::from_node(&it);
leading_ws = format!("\n\n{}", indent);
let mut indent = IndentLevel::from_node(&it);
if is_method {
indent = indent + 1;
leading_ws = format!("{}", indent);
} else {
leading_ws = format!("\n\n{}", indent);
}

fn_def = fn_def.indent(indent);
trailing_ws = String::new();
}
Expand Down Expand Up @@ -411,14 +419,13 @@ fn get_fn_target(

fn get_method_target(
ctx: &AssistContext<'_>,
target_module: &Module,
impl_: &Option<ast::Impl>,
adt: &Adt,
) -> Option<(GeneratedFunctionTarget, TextSize)> {
let target = match impl_ {
Some(impl_) => next_space_for_fn_in_impl(impl_)?,
None => {
next_space_for_fn_in_module(ctx.sema.db, &target_module.definition_source(ctx.sema.db))?
.1
GeneratedFunctionTarget::BehindItem(adt.source(ctx.sema.db)?.syntax().value.clone())
}
};
Some((target.clone(), get_insert_offset(&target)))
Expand All @@ -437,7 +444,7 @@ fn assoc_fn_target_info(
return None;
}
let (impl_, file) = get_adt_source(ctx, &adt, fn_name)?;
let (target, insert_offset) = get_method_target(ctx, &module, &impl_)?;
let (target, insert_offset) = get_method_target(ctx, &impl_, &adt)?;
let adt_name = if impl_.is_none() { Some(adt.name(ctx.sema.db)) } else { None };
Some(TargetInfo::new(target_module, adt_name, target, file, insert_offset))
}
Expand Down Expand Up @@ -1468,14 +1475,12 @@ fn foo() {S.bar$0();}
",
r"
struct S;
fn foo() {S.bar();}
impl S {
fn bar(&self) ${0:-> _} {
todo!()
}
fn bar(&self) ${0:-> _} {
todo!()
}
}
fn foo() {S.bar();}
",
)
}
Expand Down Expand Up @@ -1516,14 +1521,12 @@ fn foo() {s::S.bar$0();}
r"
mod s {
pub struct S;
impl S {
pub(crate) fn bar(&self) ${0:-> _} {
todo!()
impl S {
pub(crate) fn bar(&self) ${0:-> _} {
todo!()
}
}
}
}
fn foo() {s::S.bar();}
",
)
Expand All @@ -1544,18 +1547,16 @@ mod s {
",
r"
struct S;
impl S {
fn bar(&self) ${0:-> _} {
todo!()
}
}
mod s {
fn foo() {
super::S.bar();
}
}
impl S {
fn bar(&self) ${0:-> _} {
todo!()
}
}
",
)
Expand All @@ -1571,14 +1572,12 @@ fn foo() {$0S.bar();}
",
r"
struct S;
fn foo() {S.bar();}
impl S {
fn bar(&self) ${0:-> _} {
todo!()
}
fn bar(&self) ${0:-> _} {
todo!()
}
}
fn foo() {S.bar();}
",
)
}
Expand All @@ -1593,14 +1592,12 @@ fn foo() {S::bar$0();}
",
r"
struct S;
fn foo() {S::bar();}
impl S {
fn bar() ${0:-> _} {
todo!()
}
fn bar() ${0:-> _} {
todo!()
}
}
fn foo() {S::bar();}
",
)
}
Expand Down Expand Up @@ -1641,14 +1638,12 @@ fn foo() {s::S::bar$0();}
r"
mod s {
pub struct S;
impl S {
pub(crate) fn bar() ${0:-> _} {
todo!()
impl S {
pub(crate) fn bar() ${0:-> _} {
todo!()
}
}
}
}
fn foo() {s::S::bar();}
",
)
Expand All @@ -1664,14 +1659,12 @@ fn foo() {$0S::bar();}
",
r"
struct S;
fn foo() {S::bar();}
impl S {
fn bar() ${0:-> _} {
todo!()
}
fn bar() ${0:-> _} {
todo!()
}
}
fn foo() {S::bar();}
",
)
}
Expand Down Expand Up @@ -1841,15 +1834,13 @@ fn main() {
",
r"
enum Foo {}
fn main() {
Foo::new();
}
impl Foo {
fn new() ${0:-> _} {
todo!()
fn new() ${0:-> _} {
todo!()
}
}
fn main() {
Foo::new();
}
",
)
Expand Down

0 comments on commit 3a69435

Please sign in to comment.