From 06f1c8f5a10f0114cbd94111312ea58d59570efc Mon Sep 17 00:00:00 2001
From: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
Date: Thu, 21 Jan 2021 09:53:24 +0100
Subject: Add assist: add lifetime to type #7200

Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
---
 .../assists/src/handlers/add_lifetime_to_type.rs   | 37 ++++++++++++----------
 crates/assists/src/tests/generated.rs              |  4 +--
 2 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'crates')

diff --git a/crates/assists/src/handlers/add_lifetime_to_type.rs b/crates/assists/src/handlers/add_lifetime_to_type.rs
index 3743858a8..c1603e972 100644
--- a/crates/assists/src/handlers/add_lifetime_to_type.rs
+++ b/crates/assists/src/handlers/add_lifetime_to_type.rs
@@ -8,8 +8,8 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Adds a new lifetime to a struct, enum or union.
 //
 // ```
-// struct Point$0 {
-//     x: &u32,
+// struct Point {
+//     x: &$0u32,
 //     y: u32,
 // }
 // ```
@@ -21,6 +21,11 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // }
 // ```
 pub(crate) fn add_lifetime_to_type(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+    let ref_type_focused = ctx.find_node_at_offset::<ast::RefType>()?;
+    if ref_type_focused.lifetime().is_some() {
+        return None;
+    }
+
     let node = ctx.find_node_at_offset::<ast::AdtDef>()?;
     let has_lifetime = node
         .generic_param_list()
@@ -148,13 +153,13 @@ mod tests {
     fn add_lifetime_to_struct() {
         check_assist(
             add_lifetime_to_type,
-            "struct Foo$0 { a: &i32 }",
+            "struct Foo { a: &$0i32 }",
             "struct Foo<'a> { a: &'a i32 }",
         );
 
         check_assist(
             add_lifetime_to_type,
-            "struct Foo$0 { a: &i32, b: &usize }",
+            "struct Foo { a: &$0i32, b: &usize }",
             "struct Foo<'a> { a: &'a i32, b: &'a usize }",
         );
 
@@ -166,58 +171,58 @@ mod tests {
 
         check_assist(
             add_lifetime_to_type,
-            "struct Foo<T>$0 { a: &T, b: usize }",
+            "struct Foo<T> { a: &$0T, b: usize }",
             "struct Foo<'a, T> { a: &'a T, b: usize }",
         );
 
-        check_assist_not_applicable(add_lifetime_to_type, "struct Foo<'a>$0 { a: &'a i32 }");
-        check_assist_not_applicable(add_lifetime_to_type, "struct Foo$0 { a: &'a i32 }");
+        check_assist_not_applicable(add_lifetime_to_type, "struct Foo<'a> { a: &$0'a i32 }");
+        check_assist_not_applicable(add_lifetime_to_type, "struct Foo { a: &'a$0 i32 }");
     }
 
     #[test]
     fn add_lifetime_to_enum() {
         check_assist(
             add_lifetime_to_type,
-            "enum Foo$0 { Bar { a: i32 }, Other, Tuple(u32, &u32)}",
+            "enum Foo { Bar { a: i32 }, Other, Tuple(u32, &$0u32)}",
             "enum Foo<'a> { Bar { a: i32 }, Other, Tuple(u32, &'a u32)}",
         );
 
         check_assist(
             add_lifetime_to_type,
-            "enum Foo$0 { Bar { a: &i32 }}",
+            "enum Foo { Bar { a: &$0i32 }}",
             "enum Foo<'a> { Bar { a: &'a i32 }}",
         );
 
         check_assist(
             add_lifetime_to_type,
-            "enum Foo<T>$0 { Bar { a: &i32, b: &T }}",
+            "enum Foo<T> { Bar { a: &$0i32, b: &T }}",
             "enum Foo<'a, T> { Bar { a: &'a i32, b: &'a T }}",
         );
 
-        check_assist_not_applicable(add_lifetime_to_type, "enum Foo<'a>$0 { Bar { a: &'a i32 }}");
-        check_assist_not_applicable(add_lifetime_to_type, "enum Foo$0 { Bar, Misc }");
+        check_assist_not_applicable(add_lifetime_to_type, "enum Foo<'a> { Bar { a: &$0'a i32 }}");
+        check_assist_not_applicable(add_lifetime_to_type, "enum Foo { Bar, $0Misc }");
     }
 
     #[test]
     fn add_lifetime_to_union() {
         check_assist(
             add_lifetime_to_type,
-            "union Foo$0 { a: &i32 }",
+            "union Foo { a: &$0i32 }",
             "union Foo<'a> { a: &'a i32 }",
         );
 
         check_assist(
             add_lifetime_to_type,
-            "union Foo$0 { a: &i32, b: &usize }",
+            "union Foo { a: &$0i32, b: &usize }",
             "union Foo<'a> { a: &'a i32, b: &'a usize }",
         );
 
         check_assist(
             add_lifetime_to_type,
-            "union Foo<T>$0 { a: &T, b: usize }",
+            "union Foo<T> { a: &$0T, b: usize }",
             "union Foo<'a, T> { a: &'a T, b: usize }",
         );
 
-        check_assist_not_applicable(add_lifetime_to_type, "struct Foo<'a>$0 { a: &'a i32 }");
+        check_assist_not_applicable(add_lifetime_to_type, "struct Foo<'a> { a: &'a $0i32 }");
     }
 }
diff --git a/crates/assists/src/tests/generated.rs b/crates/assists/src/tests/generated.rs
index 4b254d463..9aa807f10 100644
--- a/crates/assists/src/tests/generated.rs
+++ b/crates/assists/src/tests/generated.rs
@@ -108,8 +108,8 @@ fn doctest_add_lifetime_to_type() {
     check_doc_test(
         "add_lifetime_to_type",
         r#####"
-struct Point$0 {
-    x: &u32,
+struct Point {
+    x: &$0u32,
     y: u32,
 }
 "#####,
-- 
cgit v1.2.3