From 705712993ffe24898e3c1fe006e1108b7d02d6bc Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Mon, 1 Mar 2021 10:51:47 +0000
Subject: [PATCH 1/7] feat: add type ascription assist
---
.../src/handlers/add_type_ascription.rs | 198 ++++++++++++++++++
crates/ide_assists/src/lib.rs | 2 +
crates/ide_assists/src/tests/generated.rs | 19 ++
xtask/src/tidy.rs | 1 +
4 files changed, 220 insertions(+)
create mode 100644 crates/ide_assists/src/handlers/add_type_ascription.rs
diff --git a/crates/ide_assists/src/handlers/add_type_ascription.rs b/crates/ide_assists/src/handlers/add_type_ascription.rs
new file mode 100644
index 00000000000..e9dc37150b9
--- /dev/null
+++ b/crates/ide_assists/src/handlers/add_type_ascription.rs
@@ -0,0 +1,198 @@
+use ide_db::defs::{Definition, NameRefClass};
+use syntax::{ast, AstNode, SyntaxKind, T};
+use test_utils::mark;
+
+use crate::{
+ assist_context::{AssistContext, Assists},
+ AssistId, AssistKind,
+};
+
+// Assist: add_type_ascription
+//
+// Adds `: _` before the assignment operator to prompt the user for a type
+//
+// ```
+// fn make<T>() -> T { todo!() }
+// fn main() {
+// let x = make$0();
+// }
+// ```
+// ->
+// ```
+// fn make<T>() -> T { todo!() }
+// fn main() {
+// let x: ${0:_} = make();
+// }
+// ```
+pub(crate) fn add_type_ascription(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+ let let_stmt = ctx.find_node_at_offset::<ast::LetStmt>()?;
+ if let_stmt.colon_token().is_some() {
+ mark::hit!(add_type_ascription_already_typed);
+ return None
+ }
+
+ let ident = ctx.find_token_syntax_at_offset(SyntaxKind::IDENT).or_else(|| {
+ let arg_list = ctx.find_node_at_offset::<ast::ArgList>()?;
+ if arg_list.args().count() > 0 {
+ return None;
+ }
+ mark::hit!(add_type_ascription_after_call);
+ arg_list.l_paren_token()?.prev_token().filter(|it| it.kind() == SyntaxKind::IDENT)
+ })?;
+ let next_token = ident.next_token()?;
+ if next_token.kind() == T![::] {
+ mark::hit!(add_type_ascription_turbofished);
+ return None;
+ }
+ let name_ref = ast::NameRef::cast(ident.parent())?;
+ let def = match NameRefClass::classify(&ctx.sema, &name_ref)? {
+ NameRefClass::Definition(def) => def,
+ NameRefClass::ExternCrate(_) | NameRefClass::FieldShorthand { .. } => return None,
+ };
+ let fun = match def {
+ Definition::ModuleDef(hir::ModuleDef::Function(it)) => it,
+ _ => return None,
+ };
+ let generics = hir::GenericDef::Function(fun).params(ctx.sema.db);
+ if generics.is_empty() {
+ mark::hit!(add_type_ascription_non_generic);
+ return None;
+ }
+ let pat = let_stmt.pat()?.syntax().last_token()?.text_range().end();
+ acc.add(
+ AssistId("add_type_ascription", AssistKind::RefactorRewrite),
+ "Add `: _` before assignment operator",
+ ident.text_range(),
+ |builder| match ctx.config.snippet_cap {
+ Some(cap) => builder.insert_snippet(cap, pat, ": ${0:_}"),
+ None => builder.insert(pat, ": _"),
+ },
+ )
+}
+
+#[cfg(test)]
+mod tests {
+ use crate::tests::{check_assist, check_assist_not_applicable};
+
+ use super::*;
+ use test_utils::mark;
+
+ #[test]
+ fn add_type_ascription_function() {
+ check_assist(
+ add_type_ascription,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x = make$0();
+}
+"#,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: ${0:_} = make();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_after_call() {
+ mark::check!(add_type_ascription_after_call);
+ check_assist(
+ add_type_ascription,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x = make()$0;
+}
+"#,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: ${0:_} = make();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_method() {
+ check_assist(
+ add_type_ascription,
+ r#"
+struct S;
+impl S {
+ fn make<T>(&self) -> T {}
+}
+fn main() {
+ let x = S.make$0();
+}
+"#,
+ r#"
+struct S;
+impl S {
+ fn make<T>(&self) -> T {}
+}
+fn main() {
+ let x: ${0:_} = S.make();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_turbofished() {
+ mark::check!(add_type_ascription_turbofished);
+ check_assist_not_applicable(
+ add_type_ascription,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x = make$0::<()>();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_already_typed() {
+ mark::check!(add_type_ascription_already_typed);
+ check_assist_not_applicable(
+ add_type_ascription,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: () = make$0();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_non_generic() {
+ mark::check!(add_type_ascription_non_generic);
+ check_assist_not_applicable(
+ add_type_ascription,
+ r#"
+fn make() -> () {}
+fn main() {
+ let x = make$0();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_no_let() {
+ check_assist_not_applicable(
+ add_type_ascription,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ make$0();
+}
+"#,
+ );
+ }
+}
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 9c8148462c0..0248cb9c075 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -111,6 +111,7 @@ mod handlers {
mod add_lifetime_to_type;
mod add_missing_impl_members;
mod add_turbo_fish;
+ mod add_type_ascription;
mod apply_demorgan;
mod auto_import;
mod change_visibility;
@@ -175,6 +176,7 @@ mod handlers {
add_explicit_type::add_explicit_type,
add_lifetime_to_type::add_lifetime_to_type,
add_turbo_fish::add_turbo_fish,
+ add_type_ascription::add_type_ascription,
apply_demorgan::apply_demorgan,
auto_import::auto_import,
change_visibility::change_visibility,
diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
index 4f007aa48bb..439ee8b222a 100644
--- a/crates/ide_assists/src/tests/generated.rs
+++ b/crates/ide_assists/src/tests/generated.rs
@@ -141,6 +141,25 @@ fn main() {
)
}
+#[test]
+fn doctest_add_type_ascription() {
+ check_doc_test(
+ "add_type_ascription",
+ r#####"
+fn make<T>() -> T { todo!() }
+fn main() {
+ let x = make$0();
+}
+"#####,
+ r#####"
+fn make<T>() -> T { todo!() }
+fn main() {
+ let x: ${0:_} = make();
+}
+"#####,
+ )
+}
+
#[test]
fn doctest_apply_demorgan() {
check_doc_test(
diff --git a/xtask/src/tidy.rs b/xtask/src/tidy.rs
index 349ca14d01a..91f1ee21717 100644
--- a/xtask/src/tidy.rs
+++ b/xtask/src/tidy.rs
@@ -277,6 +277,7 @@ fn check_todo(path: &Path, text: &str) {
"tests/tidy.rs",
// Some of our assists generate `todo!()`.
"handlers/add_turbo_fish.rs",
+ "handlers/add_type_ascription.rs",
"handlers/generate_function.rs",
// To support generating `todo!()` in assists, we have `expr_todo()` in
// `ast::make`.
From 218390b9fb0cfa713d4b6b38425f3a07fee2b564 Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Mon, 1 Mar 2021 11:21:02 +0000
Subject: [PATCH 2/7] chore: rename var
---
crates/ide_assists/src/handlers/add_type_ascription.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crates/ide_assists/src/handlers/add_type_ascription.rs b/crates/ide_assists/src/handlers/add_type_ascription.rs
index e9dc37150b9..ea9f249d329 100644
--- a/crates/ide_assists/src/handlers/add_type_ascription.rs
+++ b/crates/ide_assists/src/handlers/add_type_ascription.rs
@@ -30,6 +30,7 @@ pub(crate) fn add_type_ascription(acc: &mut Assists, ctx: &AssistContext) -> Opt
mark::hit!(add_type_ascription_already_typed);
return None
}
+ let type_pos = let_stmt.pat()?.syntax().last_token()?.text_range().end();
let ident = ctx.find_token_syntax_at_offset(SyntaxKind::IDENT).or_else(|| {
let arg_list = ctx.find_node_at_offset::<ast::ArgList>()?;
@@ -58,14 +59,13 @@ pub(crate) fn add_type_ascription(acc: &mut Assists, ctx: &AssistContext) -> Opt
mark::hit!(add_type_ascription_non_generic);
return None;
}
- let pat = let_stmt.pat()?.syntax().last_token()?.text_range().end();
acc.add(
AssistId("add_type_ascription", AssistKind::RefactorRewrite),
"Add `: _` before assignment operator",
ident.text_range(),
|builder| match ctx.config.snippet_cap {
- Some(cap) => builder.insert_snippet(cap, pat, ": ${0:_}"),
- None => builder.insert(pat, ": _"),
+ Some(cap) => builder.insert_snippet(cap, type_pos, ": ${0:_}"),
+ None => builder.insert(type_pos, ": _"),
},
)
}
From 4a36129c7a018828548e2eddebdd49cdb7d6879d Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Mon, 1 Mar 2021 11:51:52 +0000
Subject: [PATCH 3/7] chore: fmt + docs
---
crates/ide_assists/src/handlers/add_type_ascription.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crates/ide_assists/src/handlers/add_type_ascription.rs b/crates/ide_assists/src/handlers/add_type_ascription.rs
index ea9f249d329..060c326bf43 100644
--- a/crates/ide_assists/src/handlers/add_type_ascription.rs
+++ b/crates/ide_assists/src/handlers/add_type_ascription.rs
@@ -9,7 +9,7 @@ use crate::{
// Assist: add_type_ascription
//
-// Adds `: _` before the assignment operator to prompt the user for a type
+// Adds `: _` before the assignment operator to prompt the user for a type.
//
// ```
// fn make<T>() -> T { todo!() }
@@ -28,7 +28,7 @@ pub(crate) fn add_type_ascription(acc: &mut Assists, ctx: &AssistContext) -> Opt
let let_stmt = ctx.find_node_at_offset::<ast::LetStmt>()?;
if let_stmt.colon_token().is_some() {
mark::hit!(add_type_ascription_already_typed);
- return None
+ return None;
}
let type_pos = let_stmt.pat()?.syntax().last_token()?.text_range().end();
From d4fad2be8de4906ac00c373e53bb9ac593d61429 Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Tue, 2 Mar 2021 14:28:53 +0000
Subject: [PATCH 4/7] refactor: re-use add_turbo_fish function
---
.../src/handlers/add_turbo_fish.rs | 138 +++++++++++-
.../src/handlers/add_type_ascription.rs | 198 ------------------
crates/ide_assists/src/lib.rs | 2 -
3 files changed, 137 insertions(+), 201 deletions(-)
delete mode 100644 crates/ide_assists/src/handlers/add_type_ascription.rs
diff --git a/crates/ide_assists/src/handlers/add_turbo_fish.rs b/crates/ide_assists/src/handlers/add_turbo_fish.rs
index 8e9ea4fadc0..f18e3edf9fb 100644
--- a/crates/ide_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ide_assists/src/handlers/add_turbo_fish.rs
@@ -31,11 +31,13 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
return None;
}
mark::hit!(add_turbo_fish_after_call);
+ mark::hit!(add_type_ascription_after_call);
arg_list.l_paren_token()?.prev_token().filter(|it| it.kind() == SyntaxKind::IDENT)
})?;
let next_token = ident.next_token()?;
if next_token.kind() == T![::] {
mark::hit!(add_turbo_fish_one_fish_is_enough);
+ mark::hit!(add_type_ascription_turbofished);
return None;
}
let name_ref = ast::NameRef::cast(ident.parent())?;
@@ -50,8 +52,27 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
let generics = hir::GenericDef::Function(fun).params(ctx.sema.db);
if generics.is_empty() {
mark::hit!(add_turbo_fish_non_generic);
+ mark::hit!(add_type_ascription_non_generic);
return None;
}
+
+ if let Some(let_stmt) = ctx.find_node_at_offset::<ast::LetStmt>() {
+ if let_stmt.colon_token().is_none() {
+ let type_pos = let_stmt.pat()?.syntax().last_token()?.text_range().end();
+ acc.add(
+ AssistId("add_type_ascription", AssistKind::RefactorRewrite),
+ "Add `: _` before assignment operator",
+ ident.text_range(),
+ |builder| match ctx.config.snippet_cap {
+ Some(cap) => builder.insert_snippet(cap, type_pos, ": ${0:_}"),
+ None => builder.insert(type_pos, ": _"),
+ },
+ )?
+ } else {
+ mark::hit!(add_type_ascription_already_typed);
+ }
+ }
+
acc.add(
AssistId("add_turbo_fish", AssistKind::RefactorRewrite),
"Add `::<>`",
@@ -65,7 +86,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
#[cfg(test)]
mod tests {
- use crate::tests::{check_assist, check_assist_not_applicable};
+ use crate::tests::{check_assist, check_assist_by_label, check_assist_not_applicable};
use super::*;
use test_utils::mark;
@@ -158,6 +179,121 @@ fn make() -> () {}
fn main() {
make$0();
}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_function() {
+ check_assist_by_label(
+ add_turbo_fish,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x = make$0();
+}
+"#,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: ${0:_} = make();
+}
+"#,
+ "Add `: _` before assignment operator",
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_after_call() {
+ mark::check!(add_type_ascription_after_call);
+ check_assist_by_label(
+ add_turbo_fish,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x = make()$0;
+}
+"#,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: ${0:_} = make();
+}
+"#,
+ "Add `: _` before assignment operator",
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_method() {
+ check_assist_by_label(
+ add_turbo_fish,
+ r#"
+struct S;
+impl S {
+ fn make<T>(&self) -> T {}
+}
+fn main() {
+ let x = S.make$0();
+}
+"#,
+ r#"
+struct S;
+impl S {
+ fn make<T>(&self) -> T {}
+}
+fn main() {
+ let x: ${0:_} = S.make();
+}
+"#,
+ "Add `: _` before assignment operator",
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_turbofished() {
+ mark::check!(add_type_ascription_turbofished);
+ check_assist_not_applicable(
+ add_turbo_fish,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x = make$0::<()>();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_already_typed() {
+ mark::check!(add_type_ascription_already_typed);
+ check_assist(
+ add_turbo_fish,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: () = make$0();
+}
+"#,
+ r#"
+fn make<T>() -> T {}
+fn main() {
+ let x: () = make::<${0:_}>();
+}
+"#,
+ );
+ }
+
+ #[test]
+ fn add_type_ascription_non_generic() {
+ mark::check!(add_type_ascription_non_generic);
+ check_assist_not_applicable(
+ add_turbo_fish,
+ r#"
+fn make() -> () {}
+fn main() {
+ let x = make$0();
+}
"#,
);
}
diff --git a/crates/ide_assists/src/handlers/add_type_ascription.rs b/crates/ide_assists/src/handlers/add_type_ascription.rs
deleted file mode 100644
index 060c326bf43..00000000000
--- a/crates/ide_assists/src/handlers/add_type_ascription.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-use ide_db::defs::{Definition, NameRefClass};
-use syntax::{ast, AstNode, SyntaxKind, T};
-use test_utils::mark;
-
-use crate::{
- assist_context::{AssistContext, Assists},
- AssistId, AssistKind,
-};
-
-// Assist: add_type_ascription
-//
-// Adds `: _` before the assignment operator to prompt the user for a type.
-//
-// ```
-// fn make<T>() -> T { todo!() }
-// fn main() {
-// let x = make$0();
-// }
-// ```
-// ->
-// ```
-// fn make<T>() -> T { todo!() }
-// fn main() {
-// let x: ${0:_} = make();
-// }
-// ```
-pub(crate) fn add_type_ascription(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
- let let_stmt = ctx.find_node_at_offset::<ast::LetStmt>()?;
- if let_stmt.colon_token().is_some() {
- mark::hit!(add_type_ascription_already_typed);
- return None;
- }
- let type_pos = let_stmt.pat()?.syntax().last_token()?.text_range().end();
-
- let ident = ctx.find_token_syntax_at_offset(SyntaxKind::IDENT).or_else(|| {
- let arg_list = ctx.find_node_at_offset::<ast::ArgList>()?;
- if arg_list.args().count() > 0 {
- return None;
- }
- mark::hit!(add_type_ascription_after_call);
- arg_list.l_paren_token()?.prev_token().filter(|it| it.kind() == SyntaxKind::IDENT)
- })?;
- let next_token = ident.next_token()?;
- if next_token.kind() == T![::] {
- mark::hit!(add_type_ascription_turbofished);
- return None;
- }
- let name_ref = ast::NameRef::cast(ident.parent())?;
- let def = match NameRefClass::classify(&ctx.sema, &name_ref)? {
- NameRefClass::Definition(def) => def,
- NameRefClass::ExternCrate(_) | NameRefClass::FieldShorthand { .. } => return None,
- };
- let fun = match def {
- Definition::ModuleDef(hir::ModuleDef::Function(it)) => it,
- _ => return None,
- };
- let generics = hir::GenericDef::Function(fun).params(ctx.sema.db);
- if generics.is_empty() {
- mark::hit!(add_type_ascription_non_generic);
- return None;
- }
- acc.add(
- AssistId("add_type_ascription", AssistKind::RefactorRewrite),
- "Add `: _` before assignment operator",
- ident.text_range(),
- |builder| match ctx.config.snippet_cap {
- Some(cap) => builder.insert_snippet(cap, type_pos, ": ${0:_}"),
- None => builder.insert(type_pos, ": _"),
- },
- )
-}
-
-#[cfg(test)]
-mod tests {
- use crate::tests::{check_assist, check_assist_not_applicable};
-
- use super::*;
- use test_utils::mark;
-
- #[test]
- fn add_type_ascription_function() {
- check_assist(
- add_type_ascription,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x = make$0();
-}
-"#,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x: ${0:_} = make();
-}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_after_call() {
- mark::check!(add_type_ascription_after_call);
- check_assist(
- add_type_ascription,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x = make()$0;
-}
-"#,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x: ${0:_} = make();
-}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_method() {
- check_assist(
- add_type_ascription,
- r#"
-struct S;
-impl S {
- fn make<T>(&self) -> T {}
-}
-fn main() {
- let x = S.make$0();
-}
-"#,
- r#"
-struct S;
-impl S {
- fn make<T>(&self) -> T {}
-}
-fn main() {
- let x: ${0:_} = S.make();
-}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_turbofished() {
- mark::check!(add_type_ascription_turbofished);
- check_assist_not_applicable(
- add_type_ascription,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x = make$0::<()>();
-}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_already_typed() {
- mark::check!(add_type_ascription_already_typed);
- check_assist_not_applicable(
- add_type_ascription,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x: () = make$0();
-}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_non_generic() {
- mark::check!(add_type_ascription_non_generic);
- check_assist_not_applicable(
- add_type_ascription,
- r#"
-fn make() -> () {}
-fn main() {
- let x = make$0();
-}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_no_let() {
- check_assist_not_applicable(
- add_type_ascription,
- r#"
-fn make<T>() -> T {}
-fn main() {
- make$0();
-}
-"#,
- );
- }
-}
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 0248cb9c075..9c8148462c0 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -111,7 +111,6 @@ mod handlers {
mod add_lifetime_to_type;
mod add_missing_impl_members;
mod add_turbo_fish;
- mod add_type_ascription;
mod apply_demorgan;
mod auto_import;
mod change_visibility;
@@ -176,7 +175,6 @@ mod handlers {
add_explicit_type::add_explicit_type,
add_lifetime_to_type::add_lifetime_to_type,
add_turbo_fish::add_turbo_fish,
- add_type_ascription::add_type_ascription,
apply_demorgan::apply_demorgan,
auto_import::auto_import,
change_visibility::change_visibility,
From b41e73ac12efa788255ace7af9d448020b2e7c3b Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Tue, 2 Mar 2021 14:55:37 +0000
Subject: [PATCH 5/7] chore: codegen
---
crates/ide_assists/src/tests/generated.rs | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
index 439ee8b222a..4f007aa48bb 100644
--- a/crates/ide_assists/src/tests/generated.rs
+++ b/crates/ide_assists/src/tests/generated.rs
@@ -141,25 +141,6 @@ fn main() {
)
}
-#[test]
-fn doctest_add_type_ascription() {
- check_doc_test(
- "add_type_ascription",
- r#####"
-fn make<T>() -> T { todo!() }
-fn main() {
- let x = make$0();
-}
-"#####,
- r#####"
-fn make<T>() -> T { todo!() }
-fn main() {
- let x: ${0:_} = make();
-}
-"#####,
- )
-}
-
#[test]
fn doctest_apply_demorgan() {
check_doc_test(
From 9a49735d30af75166681bac7447e39bb3e8be9e0 Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Tue, 2 Mar 2021 15:02:47 +0000
Subject: [PATCH 6/7] chore: remove deleted file path
---
xtask/src/tidy.rs | 1 -
1 file changed, 1 deletion(-)
diff --git a/xtask/src/tidy.rs b/xtask/src/tidy.rs
index 91f1ee21717..349ca14d01a 100644
--- a/xtask/src/tidy.rs
+++ b/xtask/src/tidy.rs
@@ -277,7 +277,6 @@ fn check_todo(path: &Path, text: &str) {
"tests/tidy.rs",
// Some of our assists generate `todo!()`.
"handlers/add_turbo_fish.rs",
- "handlers/add_type_ascription.rs",
"handlers/generate_function.rs",
// To support generating `todo!()` in assists, we have `expr_todo()` in
// `ast::make`.
From 2c3c728e0aea90f80b6d066f97e59663371e91c5 Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Tue, 2 Mar 2021 15:26:36 +0000
Subject: [PATCH 7/7] chore: remove redundant tests
---
.../src/handlers/add_turbo_fish.rs | 30 -------------------
1 file changed, 30 deletions(-)
diff --git a/crates/ide_assists/src/handlers/add_turbo_fish.rs b/crates/ide_assists/src/handlers/add_turbo_fish.rs
index f18e3edf9fb..a08b55ebbf1 100644
--- a/crates/ide_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ide_assists/src/handlers/add_turbo_fish.rs
@@ -37,7 +37,6 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
let next_token = ident.next_token()?;
if next_token.kind() == T![::] {
mark::hit!(add_turbo_fish_one_fish_is_enough);
- mark::hit!(add_type_ascription_turbofished);
return None;
}
let name_ref = ast::NameRef::cast(ident.parent())?;
@@ -52,7 +51,6 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
let generics = hir::GenericDef::Function(fun).params(ctx.sema.db);
if generics.is_empty() {
mark::hit!(add_turbo_fish_non_generic);
- mark::hit!(add_type_ascription_non_generic);
return None;
}
@@ -250,20 +248,6 @@ fn main() {
);
}
- #[test]
- fn add_type_ascription_turbofished() {
- mark::check!(add_type_ascription_turbofished);
- check_assist_not_applicable(
- add_turbo_fish,
- r#"
-fn make<T>() -> T {}
-fn main() {
- let x = make$0::<()>();
-}
-"#,
- );
- }
-
#[test]
fn add_type_ascription_already_typed() {
mark::check!(add_type_ascription_already_typed);
@@ -280,20 +264,6 @@ fn make<T>() -> T {}
fn main() {
let x: () = make::<${0:_}>();
}
-"#,
- );
- }
-
- #[test]
- fn add_type_ascription_non_generic() {
- mark::check!(add_type_ascription_non_generic);
- check_assist_not_applicable(
- add_turbo_fish,
- r#"
-fn make() -> () {}
-fn main() {
- let x = make$0();
-}
"#,
);
}