4 files changed, 251 insertions, 10 deletions

diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index ad5fdcc4e..ad00154a3 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -4,20 +4,23 @@ use hir::ScopeDef;
 use test_utils::tested_by;
 
 use crate::completion::{CompletionContext, Completions};
+use hir::{Adt, ModuleDef};
 use ra_syntax::AstNode;
 
 pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) {
-    if !ctx.is_trivial_path {
-        return;
-    }
-
-    if ctx.is_pat_binding_or_const
+    if (!ctx.is_trivial_path && !ctx.is_pat_binding_or_const)
         || ctx.record_lit_syntax.is_some()
         || ctx.record_pat_syntax.is_some()
     {
         return;
     }
 
+    complete_enum_variants(acc, ctx);
+
+    if ctx.is_pat_binding_or_const {
+        return;
+    }
+
     ctx.scope().process_all_names(&mut |name, res| {
         if ctx.use_item_syntax.is_some() {
             if let (ScopeDef::Unknown, Some(name_ref)) = (&res, &ctx.name_ref_syntax) {
@@ -31,6 +34,24 @@ pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
     });
 }
 
+fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext) {
+    if let Some(ty) = ctx.expected_type_of(&ctx.token.parent()) {
+        if let Some(Adt::Enum(enum_data)) = ty.as_adt() {
+            let variants = enum_data.variants(ctx.db);
+            let module = enum_data.module(ctx.db);
+            for variant in variants {
+                if let Some(path) = module.find_use_path(ctx.db, ModuleDef::from(variant)) {
+                    // Variants with trivial paths are already added by the existing completion logic,
+                    // so we should avoid adding these twice
+                    if path.segments.len() > 1 {
+                        acc.add_enum_variant(ctx, variant, Some(path.to_string()));
+                    }
+                }
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use insta::assert_debug_snapshot;
@@ -82,7 +103,7 @@ mod tests {
                 }
                 "
             ),
-            @r###"[]"###
+            @"[]"
         );
     }
 
@@ -1109,4 +1130,182 @@ mod tests {
         "###
         );
     }
+    #[test]
+    fn completes_enum_variant_matcharm() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                enum Foo {
+                    Bar,
+                    Baz,
+                    Quux
+                }
+
+                fn main() {
+                    let foo = Foo::Quux;
+
+                    match foo {
+                        Qu<|>
+                    }
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Foo",
+                source_range: [248; 250),
+                delete: [248; 250),
+                insert: "Foo",
+                kind: Enum,
+            },
+            CompletionItem {
+                label: "Foo::Bar",
+                source_range: [248; 250),
+                delete: [248; 250),
+                insert: "Foo::Bar",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "Foo::Baz",
+                source_range: [248; 250),
+                delete: [248; 250),
+                insert: "Foo::Baz",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "Foo::Quux",
+                source_range: [248; 250),
+                delete: [248; 250),
+                insert: "Foo::Quux",
+                kind: EnumVariant,
+                detail: "()",
+            },
+        ]
+        "###
+        )
+    }
+
+    #[test]
+    fn completes_enum_variant_iflet() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                enum Foo {
+                    Bar,
+                    Baz,
+                    Quux
+                }
+
+                fn main() {
+                    let foo = Foo::Quux;
+
+                    if let Qu<|> = foo {
+
+                    }
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Foo",
+                source_range: [219; 221),
+                delete: [219; 221),
+                insert: "Foo",
+                kind: Enum,
+            },
+            CompletionItem {
+                label: "Foo::Bar",
+                source_range: [219; 221),
+                delete: [219; 221),
+                insert: "Foo::Bar",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "Foo::Baz",
+                source_range: [219; 221),
+                delete: [219; 221),
+                insert: "Foo::Baz",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "Foo::Quux",
+                source_range: [219; 221),
+                delete: [219; 221),
+                insert: "Foo::Quux",
+                kind: EnumVariant,
+                detail: "()",
+            },
+        ]
+        "###
+        )
+    }
+
+    #[test]
+    fn completes_enum_variant_basic_expr() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                enum Foo {
+                    Bar,
+                    Baz,
+                    Quux
+                }
+
+                fn main() {
+                    let foo: Foo = Q<|>
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Foo",
+                source_range: [185; 186),
+                delete: [185; 186),
+                insert: "Foo",
+                kind: Enum,
+            },
+            CompletionItem {
+                label: "Foo::Bar",
+                source_range: [185; 186),
+                delete: [185; 186),
+                insert: "Foo::Bar",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "Foo::Baz",
+                source_range: [185; 186),
+                delete: [185; 186),
+                insert: "Foo::Baz",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "Foo::Quux",
+                source_range: [185; 186),
+                delete: [185; 186),
+                insert: "Foo::Quux",
+                kind: EnumVariant,
+                detail: "()",
+            },
+            CompletionItem {
+                label: "main()",
+                source_range: [185; 186),
+                delete: [185; 186),
+                insert: "main()$0",
+                kind: Function,
+                lookup: "main",
+                detail: "fn main()",
+            },
+        ]
+        "###
+        )
+    }
 }
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 46e243192..dd7c8a873 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-use hir::{Semantics, SemanticsScope};
+use hir::{Semantics, SemanticsScope, Type};
 use ra_db::SourceDatabase;
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
@@ -172,6 +172,17 @@ impl<'a> CompletionContext<'a> {
         self.sema.scope_at_offset(&self.token.parent(), self.offset)
     }
 
+    pub(crate) fn expected_type_of(&self, node: &SyntaxNode) -> Option<Type> {
+        for ancestor in node.ancestors() {
+            if let Some(pat) = ast::Pat::cast(ancestor.clone()) {
+                return self.sema.type_of_pat(&pat);
+            } else if let Some(expr) = ast::Expr::cast(ancestor) {
+                return self.sema.type_of_expr(&expr);
+            }
+        }
+        None
+    }
+
     fn fill(
         &mut self,
         original_file: &SyntaxNode,
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 6289f53f3..67bc9c31b 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -176,7 +176,7 @@ impl ToNav for FileSymbol {
             file_id: self.file_id,
             name: self.name.clone(),
             kind: self.kind,
-            full_range: self.ptr.range(),
+            full_range: self.range,
             focus_range: self.name_range,
             container_name: self.container_name.clone(),
             description: description_from_symbol(db, self),
diff --git a/crates/ra_ide/src/runnables.rs b/crates/ra_ide/src/runnables.rs
index 9433f3a24..05a66e03c 100644
--- a/crates/ra_ide/src/runnables.rs
+++ b/crates/ra_ide/src/runnables.rs
@@ -34,7 +34,7 @@ impl Display for TestId {
 
 #[derive(Debug)]
 pub enum RunnableKind {
-    Test { test_id: TestId },
+    Test { test_id: TestId, attr: TestAttr },
     TestMod { path: String },
     Bench { test_id: TestId },
     Bin,
@@ -77,7 +77,8 @@ fn runnable_fn(sema: &Semantics<RootDatabase>, fn_def: ast::FnDef) -> Option<Run
         };
 
         if has_test_related_attribute(&fn_def) {
-            RunnableKind::Test { test_id }
+            let attr = TestAttr::from_fn(&fn_def);
+            RunnableKind::Test { test_id, attr }
         } else if fn_def.has_atom_attr("bench") {
             RunnableKind::Bench { test_id }
         } else {
@@ -87,6 +88,21 @@ fn runnable_fn(sema: &Semantics<RootDatabase>, fn_def: ast::FnDef) -> Option<Run
     Some(Runnable { range: fn_def.syntax().text_range(), kind })
 }
 
+#[derive(Debug)]
+pub struct TestAttr {
+    pub ignore: bool,
+}
+
+impl TestAttr {
+    fn from_fn(fn_def: &ast::FnDef) -> TestAttr {
+        let ignore = fn_def
+            .attrs()
+            .filter_map(|attr| attr.simple_name())
+            .any(|attribute_text| attribute_text == "ignore");
+        TestAttr { ignore }
+    }
+}
+
 /// This is a method with a heuristics to support test methods annotated with custom test annotations, such as
 /// `#[test_case(...)]`, `#[tokio::test]` and similar.
 /// Also a regular `#[test]` annotation is supported.
@@ -157,6 +173,9 @@ mod tests {
                     test_id: Path(
                         "test_foo",
                     ),
+                    attr: TestAttr {
+                        ignore: false,
+                    },
                 },
             },
             Runnable {
@@ -165,6 +184,9 @@ mod tests {
                     test_id: Path(
                         "test_foo",
                     ),
+                    attr: TestAttr {
+                        ignore: true,
+                    },
                 },
             },
         ]
@@ -200,6 +222,9 @@ mod tests {
                     test_id: Path(
                         "test_mod::test_foo1",
                     ),
+                    attr: TestAttr {
+                        ignore: false,
+                    },
                 },
             },
         ]
@@ -237,6 +262,9 @@ mod tests {
                     test_id: Path(
                         "foo::test_mod::test_foo1",
                     ),
+                    attr: TestAttr {
+                        ignore: false,
+                    },
                 },
             },
         ]
@@ -276,6 +304,9 @@ mod tests {
                     test_id: Path(
                         "foo::bar::test_mod::test_foo1",
                     ),
+                    attr: TestAttr {
+                        ignore: false,
+                    },
                 },
             },
         ]