Merge #1924

1924: Support inferring&completing `Self` type in enum/struct/union definitions r=ice1000 a=ice1000

Signed-off-by: ice1000 <[email protected]>

An attempt to fix #1908.
This code works, but I believe the implementation is ugly. Please give me suggestions!

Co-authored-by: ice1000 <[email protected]>

2 files changed, 30 insertions, 1 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 515a6285c..38a6c3d37 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -310,6 +310,35 @@ mod tests {
     }
 
     #[test]
+    fn completes_self_in_enum() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                enum X {
+                    Y(<|>)
+                }
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Self",
+        source_range: [48; 48),
+        delete: [48; 48),
+        insert: "Self",
+        kind: TypeParam,
+    },
+    CompletionItem {
+        label: "X",
+        source_range: [48; 48),
+        delete: [48; 48),
+        insert: "X",
+        kind: Enum,
+    },
+]"###
+        );
+    }
+
+    #[test]
     fn completes_module_items() {
         assert_debug_snapshot!(
         do_reference_completion(
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 48028a2f9..eb480a775 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -72,7 +72,7 @@ impl Completions {
             }
             ScopeDef::GenericParam(..) => (CompletionItemKind::TypeParam, None),
             ScopeDef::LocalBinding(..) => (CompletionItemKind::Binding, None),
-            ScopeDef::SelfType(..) => (
+            ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => (
                 CompletionItemKind::TypeParam, // (does this need its own kind?)
                 None,
             ),