diff options
Diffstat (limited to 'crates/assists/src/handlers/extract_struct_from_enum_variant.rs')
-rw-r--r-- | crates/assists/src/handlers/extract_struct_from_enum_variant.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs index 2e56bd7ff..030b9cd0c 100644 --- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs +++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use std::iter; | 1 | use std::iter; |
2 | 2 | ||
3 | use either::Either; | 3 | use either::Either; |
4 | use hir::{AsName, EnumVariant, Module, ModuleDef, Name}; | 4 | use hir::{AsName, Module, ModuleDef, Name, Variant}; |
5 | use ide_db::helpers::{ | 5 | use ide_db::helpers::{ |
6 | insert_use::{insert_use, ImportScope}, | 6 | insert_use::{insert_use, ImportScope}, |
7 | mod_path_to_ast, | 7 | mod_path_to_ast, |
@@ -53,7 +53,7 @@ pub(crate) fn extract_struct_from_enum_variant( | |||
53 | let variant_hir_name = variant_hir.name(ctx.db()); | 53 | let variant_hir_name = variant_hir.name(ctx.db()); |
54 | let enum_module_def = ModuleDef::from(enum_hir); | 54 | let enum_module_def = ModuleDef::from(enum_hir); |
55 | let usages = | 55 | let usages = |
56 | Definition::ModuleDef(ModuleDef::EnumVariant(variant_hir)).usages(&ctx.sema).all(); | 56 | Definition::ModuleDef(ModuleDef::Variant(variant_hir)).usages(&ctx.sema).all(); |
57 | 57 | ||
58 | let mut visited_modules_set = FxHashSet::default(); | 58 | let mut visited_modules_set = FxHashSet::default(); |
59 | let current_module = enum_hir.module(ctx.db()); | 59 | let current_module = enum_hir.module(ctx.db()); |
@@ -109,7 +109,7 @@ fn extract_field_list_if_applicable( | |||
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &EnumVariant) -> bool { | 112 | fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &Variant) -> bool { |
113 | variant | 113 | variant |
114 | .parent_enum(db) | 114 | .parent_enum(db) |
115 | .module(db) | 115 | .module(db) |
@@ -119,7 +119,7 @@ fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &En | |||
119 | // only check type-namespace | 119 | // only check type-namespace |
120 | hir::ScopeDef::ModuleDef(def) => matches!(def, | 120 | hir::ScopeDef::ModuleDef(def) => matches!(def, |
121 | ModuleDef::Module(_) | ModuleDef::Adt(_) | | 121 | ModuleDef::Module(_) | ModuleDef::Adt(_) | |
122 | ModuleDef::EnumVariant(_) | ModuleDef::Trait(_) | | 122 | ModuleDef::Variant(_) | ModuleDef::Trait(_) | |
123 | ModuleDef::TypeAlias(_) | ModuleDef::BuiltinType(_) | 123 | ModuleDef::TypeAlias(_) | ModuleDef::BuiltinType(_) |
124 | ), | 124 | ), |
125 | _ => false, | 125 | _ => false, |