mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use snippets

Browse Source
This commit is contained in:
Jonas Schievink 2021-03-29 13:23:07 +02:00
parent 8c1092455e
commit 3c6c1c99b4
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/ide_assists/src/handlers/extract_type_alias.rs
View File

@ -13,10 +13,10 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
// ``` // ```
// -> // ->
// ``` // ```
// type ${0:Type} = (u8, u8, u8); // type $0Type = (u8, u8, u8);
// //
// struct S { // struct S {
// field: ${0:Type}, // field: Type,
// } // }
// ``` // ```
pub(crate) fn extract_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { pub(crate) fn extract_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
@ -34,17 +34,12 @@ pub(crate) fn extract_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Opti
target, target,
|builder| { |builder| {
builder.edit_file(ctx.frange.file_id); builder.edit_file(ctx.frange.file_id);
builder.replace(target, "Type");
match ctx.config.snippet_cap { match ctx.config.snippet_cap {
Some(cap) => { Some(cap) => {
builder.replace_snippet(cap, target, "${0:Type}"); builder.insert_snippet(cap, insert, format!("type $0Type = {};\n\n", node));
builder.insert_snippet(
cap,
insert,
format!("type ${{0:Type}} = {};\n\n", node),
);
} }
None => { None => {
builder.replace(target, "Type");
builder.insert(insert, format!("type Type = {};\n\n", node)); builder.insert(insert, format!("type Type = {};\n\n", node));
} }
} }
@ -80,10 +75,10 @@ struct S {
} }
", ",
r#" r#"
type ${0:Type} = u8; type $0Type = u8;
struct S { struct S {
field: ${0:Type}, field: Type,
} }
"#, "#,
); );
@ -103,10 +98,10 @@ fn f() {
r#" r#"
fn generic<T>() {} fn generic<T>() {}
type ${0:Type} = (); type $0Type = ();
fn f() { fn f() {
generic::<${0:Type}>(); generic::<Type>();
} }
"#, "#,
); );
@ -124,10 +119,10 @@ struct S {
", ",
r#" r#"
struct Vec<T> {} struct Vec<T> {}
type ${0:Type} = Vec<u8>; type $0Type = Vec<u8>;
struct S { struct S {
v: Vec<Vec<${0:Type}>>, v: Vec<Vec<Type>>,
} }
"#, "#,
); );
@ -143,10 +138,10 @@ struct S {
} }
", ",
r#" r#"
type ${0:Type} = u8; type $0Type = u8;
struct S { struct S {
field: (${0:Type},), field: (Type,),
} }
"#, "#,
); );

4
crates/ide_assists/src/tests/generated.rs
View File

@ -338,10 +338,10 @@ struct S {
} }
"#####, "#####,
r#####" r#####"
type ${0:Type} = (u8, u8, u8); type $0Type = (u8, u8, u8);
struct S { struct S {
field: ${0:Type}, field: Type,
} }
"#####, "#####,
) )