2 files changed, 15 insertions, 8 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index 4723a65a6..6a55670d1 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -21,14 +21,20 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) -> C
                     .add_to(acc)
             });
         }
-        hir::Def::Enum(e) => e
-            .variants(ctx.db)?
-            .into_iter()
-            .for_each(|(name, _variant)| {
-                CompletionItem::new(CompletionKind::Reference, name.to_string())
-                    .kind(CompletionItemKind::EnumVariant)
-                    .add_to(acc)
-            }),
+        hir::Def::Enum(e) => {
+            e.variants(ctx.db)?
+                .unwrap_or(vec![])
+                .into_iter()
+                .for_each(|variant| {
+                    let variant_name = variant.name(ctx.db);
+
+                    if let Ok(Some(name)) = variant_name {
+                        CompletionItem::new(CompletionKind::Reference, name.to_string())
+                            .kind(CompletionItemKind::EnumVariant)
+                            .add_to(acc)
+                    }
+                })
+        }
         _ => return Ok(()),
     };
     Ok(())
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index a2e06f5db..efdf261be 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -122,6 +122,7 @@ salsa::database_storage! {
             fn type_for_field() for hir::db::TypeForFieldQuery;
             fn struct_data() for hir::db::StructDataQuery;
             fn enum_data() for hir::db::EnumDataQuery;
+            fn enum_variant_data() for hir::db::EnumVariantDataQuery;
             fn impls_in_module() for hir::db::ImplsInModuleQuery;
             fn body_hir() for hir::db::BodyHirQuery;
             fn body_syntax_mapping() for hir::db::BodySyntaxMappingQuery;