2022-06-22 09:29:59 -05:00
|
|
|
use ide_db::{
|
|
|
|
imports::import_assets::item_for_path_search, use_trivial_contructor::use_trivial_constructor,
|
|
|
|
};
|
2020-08-12 08:04:06 -05:00
|
|
|
use itertools::Itertools;
|
2020-08-12 11:26:51 -05:00
|
|
|
use stdx::format_to;
|
2021-09-27 05:54:24 -05:00
|
|
|
use syntax::ast::{self, AstNode, HasName, HasVisibility, StructKind};
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2021-02-05 09:32:34 -06:00
|
|
|
use crate::{
|
2021-02-12 04:48:43 -06:00
|
|
|
utils::{find_impl_block_start, find_struct_impl, generate_impl_text},
|
2021-02-05 09:32:34 -06:00
|
|
|
AssistContext, AssistId, AssistKind, Assists,
|
|
|
|
};
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2020-07-03 11:15:03 -05:00
|
|
|
// Assist: generate_new
|
2019-11-09 09:56:36 -06:00
|
|
|
//
|
2022-07-23 10:09:01 -05:00
|
|
|
// Adds a `fn new` for a type.
|
2019-11-09 09:56:36 -06:00
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// struct Ctx<T: Clone> {
|
2021-01-06 14:15:48 -06:00
|
|
|
// data: T,$0
|
2019-11-09 09:56:36 -06:00
|
|
|
// }
|
|
|
|
// ```
|
|
|
|
// ->
|
|
|
|
// ```
|
|
|
|
// struct Ctx<T: Clone> {
|
|
|
|
// data: T,
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// impl<T: Clone> Ctx<T> {
|
2020-05-20 03:17:46 -05:00
|
|
|
// fn $0new(data: T) -> Self { Self { data } }
|
2019-11-09 09:56:36 -06:00
|
|
|
// }
|
|
|
|
// ```
|
2022-07-20 08:02:08 -05:00
|
|
|
pub(crate) fn generate_new(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
|
2020-07-30 10:50:40 -05:00
|
|
|
let strukt = ctx.find_node_at_offset::<ast::Struct>()?;
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
// We want to only apply this to non-union structs with named fields
|
2019-11-25 08:30:50 -06:00
|
|
|
let field_list = match strukt.kind() {
|
|
|
|
StructKind::Record(named) => named,
|
2019-11-09 09:56:36 -06:00
|
|
|
_ => return None,
|
|
|
|
};
|
|
|
|
|
|
|
|
// Return early if we've found an existing new fn
|
2021-06-12 22:54:16 -05:00
|
|
|
let impl_def = find_struct_impl(ctx, &ast::Adt::Struct(strukt.clone()), "new")?;
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2022-06-22 09:29:59 -05:00
|
|
|
let current_module = ctx.sema.scope(strukt.syntax())?.module();
|
|
|
|
|
2020-05-06 05:51:28 -05:00
|
|
|
let target = strukt.syntax().text_range();
|
2020-07-03 12:14:42 -05:00
|
|
|
acc.add(AssistId("generate_new", AssistKind::Generate), "Generate `new`", target, |builder| {
|
2020-07-02 17:01:22 -05:00
|
|
|
let mut buf = String::with_capacity(512);
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2020-07-02 17:01:22 -05:00
|
|
|
if impl_def.is_some() {
|
|
|
|
buf.push('\n');
|
|
|
|
}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2020-07-02 17:01:22 -05:00
|
|
|
let vis = strukt.visibility().map_or(String::new(), |v| format!("{} ", v));
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2022-06-14 19:41:28 -05:00
|
|
|
let trivial_constructors = field_list
|
|
|
|
.fields()
|
|
|
|
.map(|f| {
|
|
|
|
let ty = ctx.sema.resolve_type(&f.ty()?)?;
|
|
|
|
|
|
|
|
let item_in_ns = hir::ItemInNs::from(hir::ModuleDef::from(ty.as_adt()?));
|
|
|
|
|
2022-09-09 13:04:56 -05:00
|
|
|
let type_path = current_module.find_use_path(
|
|
|
|
ctx.sema.db,
|
|
|
|
item_for_path_search(ctx.sema.db, item_in_ns)?,
|
|
|
|
ctx.config.prefer_core,
|
|
|
|
)?;
|
2022-06-14 19:41:28 -05:00
|
|
|
|
|
|
|
let expr = use_trivial_constructor(
|
|
|
|
&ctx.sema.db,
|
|
|
|
ide_db::helpers::mod_path_to_ast(&type_path),
|
|
|
|
&ty,
|
|
|
|
)?;
|
|
|
|
|
|
|
|
Some(format!("{}: {}", f.name()?.syntax(), expr))
|
|
|
|
})
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
2020-07-02 17:01:22 -05:00
|
|
|
let params = field_list
|
|
|
|
.fields()
|
2022-06-14 19:41:28 -05:00
|
|
|
.enumerate()
|
|
|
|
.filter_map(|(i, f)| {
|
|
|
|
if trivial_constructors[i].is_none() {
|
|
|
|
Some(format!("{}: {}", f.name()?.syntax(), f.ty()?.syntax()))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.format(", ");
|
|
|
|
|
|
|
|
let fields = field_list
|
|
|
|
.fields()
|
|
|
|
.enumerate()
|
|
|
|
.filter_map(|(i, f)| {
|
|
|
|
let contructor = trivial_constructors[i].clone();
|
|
|
|
if contructor.is_some() {
|
|
|
|
contructor
|
|
|
|
} else {
|
|
|
|
Some(f.name()?.to_string())
|
|
|
|
}
|
|
|
|
})
|
2020-08-12 08:04:06 -05:00
|
|
|
.format(", ");
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2022-03-26 13:39:36 -05:00
|
|
|
format_to!(buf, " {}fn new({}) -> Self {{ Self {{ {} }} }}", vis, params, fields);
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2020-07-02 17:01:22 -05:00
|
|
|
let start_offset = impl_def
|
2021-02-12 04:48:43 -06:00
|
|
|
.and_then(|impl_def| find_impl_block_start(impl_def, &mut buf))
|
2020-07-02 17:01:22 -05:00
|
|
|
.unwrap_or_else(|| {
|
2021-05-14 10:53:53 -05:00
|
|
|
buf = generate_impl_text(&ast::Adt::Struct(strukt.clone()), &buf);
|
2020-07-02 17:01:22 -05:00
|
|
|
strukt.syntax().text_range().end()
|
|
|
|
});
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2020-07-02 17:01:22 -05:00
|
|
|
match ctx.config.snippet_cap {
|
|
|
|
None => builder.insert(start_offset, buf),
|
|
|
|
Some(cap) => {
|
|
|
|
buf = buf.replace("fn new", "fn $0new");
|
|
|
|
builder.insert_snippet(cap, start_offset, buf);
|
2020-05-20 03:17:46 -05:00
|
|
|
}
|
2020-07-02 17:01:22 -05:00
|
|
|
}
|
|
|
|
})
|
2019-11-09 09:56:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2020-05-06 03:16:55 -05:00
|
|
|
use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2019-11-15 13:48:07 -06:00
|
|
|
use super::*;
|
|
|
|
|
2022-07-13 09:16:48 -05:00
|
|
|
#[test]
|
|
|
|
fn test_generate_new_with_zst_fields() {
|
|
|
|
check_assist(
|
|
|
|
generate_new,
|
|
|
|
r#"
|
|
|
|
struct Empty;
|
|
|
|
|
|
|
|
struct Foo { empty: Empty $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Empty;
|
|
|
|
|
|
|
|
struct Foo { empty: Empty }
|
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn $0new() -> Self { Self { empty: Empty } }
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
check_assist(
|
|
|
|
generate_new,
|
|
|
|
r#"
|
|
|
|
struct Empty;
|
|
|
|
|
|
|
|
struct Foo { baz: String, empty: Empty $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Empty;
|
|
|
|
|
|
|
|
struct Foo { baz: String, empty: Empty }
|
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn $0new(baz: String) -> Self { Self { baz, empty: Empty } }
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
check_assist(
|
|
|
|
generate_new,
|
|
|
|
r#"
|
|
|
|
enum Empty { Bar }
|
|
|
|
|
|
|
|
struct Foo { empty: Empty $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum Empty { Bar }
|
|
|
|
|
|
|
|
struct Foo { empty: Empty }
|
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn $0new() -> Self { Self { empty: Empty::Bar } }
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
|
|
|
|
// make sure the assist only works on unit variants
|
|
|
|
check_assist(
|
|
|
|
generate_new,
|
|
|
|
r#"
|
|
|
|
struct Empty {}
|
|
|
|
|
|
|
|
struct Foo { empty: Empty $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Empty {}
|
|
|
|
|
|
|
|
struct Foo { empty: Empty }
|
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn $0new(empty: Empty) -> Self { Self { empty } }
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
check_assist(
|
|
|
|
generate_new,
|
|
|
|
r#"
|
|
|
|
enum Empty { Bar {} }
|
|
|
|
|
|
|
|
struct Foo { empty: Empty $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum Empty { Bar {} }
|
|
|
|
|
|
|
|
struct Foo { empty: Empty }
|
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn $0new(empty: Empty) -> Self { Self { empty } }
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-11-09 09:56:36 -06:00
|
|
|
#[test]
|
2020-07-03 11:15:03 -05:00
|
|
|
fn test_generate_new() {
|
2019-11-09 09:56:36 -06:00
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo {$0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new() -> Self { Self { } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo<T: Clone> {$0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo<T: Clone> {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl<T: Clone> Foo<T> {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new() -> Self { Self { } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo<'a, T: Foo<'a>> {$0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo<'a, T: Foo<'a>> {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl<'a, T: Foo<'a>> Foo<'a, T> {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new() -> Self { Self { } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo { baz: String $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo { baz: String }
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new(baz: String) -> Self { Self { baz } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo { baz: String, qux: Vec<i32> $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo { baz: String, qux: Vec<i32> }
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new(baz: String, qux: Vec<i32>) -> Self { Self { baz, qux } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2021-05-14 10:53:53 -05:00
|
|
|
#[test]
|
|
|
|
fn check_that_visibility_modifiers_dont_get_brought_in() {
|
2019-11-09 09:56:36 -06:00
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo { pub baz: String, pub qux: Vec<i32> $0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo { pub baz: String, pub qux: Vec<i32> }
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new(baz: String, qux: Vec<i32>) -> Self { Self { baz, qux } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2021-05-14 10:53:53 -05:00
|
|
|
#[test]
|
|
|
|
fn check_it_reuses_existing_impls() {
|
2019-11-09 09:56:36 -06:00
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo {$0}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {}
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new() -> Self { Self { } }
|
2019-11-09 09:56:36 -06:00
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo {$0}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn qux(&self) {}
|
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new() -> Self { Self { } }
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
fn qux(&self) {}
|
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
struct Foo {$0}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn qux(&self) {}
|
|
|
|
fn baz() -> i32 {
|
|
|
|
5
|
|
|
|
}
|
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
struct Foo {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
fn $0new() -> Self { Self { } }
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
fn qux(&self) {}
|
|
|
|
fn baz() -> i32 {
|
|
|
|
5
|
|
|
|
}
|
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
2021-05-14 10:53:53 -05:00
|
|
|
#[test]
|
|
|
|
fn check_visibility_of_new_fn_based_on_struct() {
|
2019-11-09 09:56:36 -06:00
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
pub struct Foo {$0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
pub struct Foo {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
pub fn $0new() -> Self { Self { } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
|
|
|
pub(crate) struct Foo {$0}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
pub(crate) struct Foo {}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
2020-05-20 03:17:46 -05:00
|
|
|
pub(crate) fn $0new() -> Self { Self { } }
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-07-03 11:15:03 -05:00
|
|
|
fn generate_new_not_applicable_if_fn_exists() {
|
2019-11-09 09:56:36 -06:00
|
|
|
check_assist_not_applicable(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
2021-01-06 14:15:48 -06:00
|
|
|
struct Foo {$0}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn new() -> Self {
|
|
|
|
Self
|
2019-11-15 13:48:07 -06:00
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
|
|
|
|
check_assist_not_applicable(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
2021-01-06 14:15:48 -06:00
|
|
|
struct Foo {$0}
|
2019-11-09 09:56:36 -06:00
|
|
|
|
|
|
|
impl Foo {
|
|
|
|
fn New() -> Self {
|
|
|
|
Self
|
2019-11-15 13:48:07 -06:00
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-07-03 11:15:03 -05:00
|
|
|
fn generate_new_target() {
|
2019-11-09 09:56:36 -06:00
|
|
|
check_assist_target(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
2019-11-09 09:56:36 -06:00
|
|
|
struct SomeThingIrrelevant;
|
|
|
|
/// Has a lifetime parameter
|
2021-01-06 14:15:48 -06:00
|
|
|
struct Foo<'a, T: Foo<'a>> {$0}
|
2019-11-09 09:56:36 -06:00
|
|
|
struct EvenMoreIrrelevant;
|
2021-05-14 10:53:53 -05:00
|
|
|
"#,
|
2019-11-09 09:56:36 -06:00
|
|
|
"/// Has a lifetime parameter
|
|
|
|
struct Foo<'a, T: Foo<'a>> {}",
|
|
|
|
);
|
|
|
|
}
|
2019-11-15 13:48:07 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_unrelated_new() {
|
|
|
|
check_assist(
|
2020-07-03 11:15:03 -05:00
|
|
|
generate_new,
|
2021-05-14 10:53:53 -05:00
|
|
|
r#"
|
2019-11-15 13:48:07 -06:00
|
|
|
pub struct AstId<N: AstNode> {
|
|
|
|
file_id: HirFileId,
|
|
|
|
file_ast_id: FileAstId<N>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<N: AstNode> AstId<N> {
|
|
|
|
pub fn new(file_id: HirFileId, file_ast_id: FileAstId<N>) -> AstId<N> {
|
|
|
|
AstId { file_id, file_ast_id }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Source<T> {
|
2021-01-06 14:15:48 -06:00
|
|
|
pub file_id: HirFileId,$0
|
2019-11-15 13:48:07 -06:00
|
|
|
pub ast: T,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> Source<T> {
|
|
|
|
pub fn map<F: FnOnce(T) -> U, U>(self, f: F) -> Source<U> {
|
|
|
|
Source { file_id: self.file_id, ast: f(self.ast) }
|
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
2019-11-15 13:48:07 -06:00
|
|
|
pub struct AstId<N: AstNode> {
|
|
|
|
file_id: HirFileId,
|
|
|
|
file_ast_id: FileAstId<N>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<N: AstNode> AstId<N> {
|
|
|
|
pub fn new(file_id: HirFileId, file_ast_id: FileAstId<N>) -> AstId<N> {
|
|
|
|
AstId { file_id, file_ast_id }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Source<T> {
|
|
|
|
pub file_id: HirFileId,
|
|
|
|
pub ast: T,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> Source<T> {
|
2020-05-20 03:17:46 -05:00
|
|
|
pub fn $0new(file_id: HirFileId, ast: T) -> Self { Self { file_id, ast } }
|
2019-11-15 13:48:07 -06:00
|
|
|
|
|
|
|
pub fn map<F: FnOnce(T) -> U, U>(self, f: F) -> Source<U> {
|
|
|
|
Source { file_id: self.file_id, ast: f(self.ast) }
|
|
|
|
}
|
2021-05-14 10:53:53 -05:00
|
|
|
}
|
|
|
|
"#,
|
2019-11-15 13:48:07 -06:00
|
|
|
);
|
|
|
|
}
|
2019-11-09 09:56:36 -06:00
|
|
|
}
|