language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Dedup code

Browse source
This commit is contained in:
Ole Strohm 2022-02-22 22:41:03 +00:00
parent 43a4c45ede
commit 94a221ae8d
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/ide_assists/src/handlers/add_missing_match_arms.rs
View file

@ -81,19 +81,12 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext) ->
) = if let Some(enum_def) = resolve_enum_def(&ctx.sema, &expr) { ) = if let Some(enum_def) = resolve_enum_def(&ctx.sema, &expr) {
let variants = enum_def.variants(ctx.db()); let variants = enum_def.variants(ctx.db());
let is_non_exhaustive = match enum_def { let is_non_exhaustive = enum_def.is_non_exhaustive(ctx.db());
ExtendedEnum::Enum(e) => e.attrs(ctx.db()).by_key("non_exhaustive").exists(),
_ => false,
};
let missing_pats = variants let missing_pats = variants
.into_iter() .into_iter()
.filter_map(|variant| { .filter_map(|variant| {
let is_hidden = match variant { Some((build_pat(ctx.db(), module, variant)?, variant.has_doc_hidden(ctx.db())))
ExtendedVariant::Variant(var) => var.attrs(ctx.db()).has_doc_hidden(),
_ => false,
};
Some((build_pat(ctx.db(), module, variant)?, is_hidden))
}) })
.filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat)); .filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat));
@ -108,10 +101,8 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext) ->
}; };
(missing_pats.peekable(), is_non_exhaustive) (missing_pats.peekable(), is_non_exhaustive)
} else if let Some(enum_defs) = resolve_tuple_of_enum_def(&ctx.sema, &expr) { } else if let Some(enum_defs) = resolve_tuple_of_enum_def(&ctx.sema, &expr) {
let is_non_exhaustive = enum_defs.iter().any(|enum_def| match enum_def { let is_non_exhaustive =
ExtendedEnum::Enum(e) => e.attrs(ctx.db()).by_key("non_exhaustive").exists(), enum_defs.iter().any(|enum_def| enum_def.is_non_exhaustive(ctx.db()));
_ => false,
});
let mut n_arms = 1; let mut n_arms = 1;
let variants_of_enums: Vec<Vec<ExtendedVariant>> = enum_defs let variants_of_enums: Vec<Vec<ExtendedVariant>> = enum_defs
@ -136,10 +127,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext) ->
.multi_cartesian_product() .multi_cartesian_product()
.inspect(|_| cov_mark::hit!(add_missing_match_arms_lazy_computation)) .inspect(|_| cov_mark::hit!(add_missing_match_arms_lazy_computation))
.map(|variants| { .map(|variants| {
let is_hidden = variants.iter().any(|variant| match variant { let is_hidden = variants.iter().any(|variant| variant.has_doc_hidden(ctx.db()));
ExtendedVariant::Variant(var) => var.attrs(ctx.db()).has_doc_hidden(),
_ => false,
});
let patterns = let patterns =
variants.into_iter().filter_map(|variant| build_pat(ctx.db(), module, variant)); variants.into_iter().filter_map(|variant| build_pat(ctx.db(), module, variant));
@ -293,11 +281,27 @@ enum ExtendedVariant {
Variant(hir::Variant), Variant(hir::Variant),
} }
impl ExtendedVariant {
fn has_doc_hidden(self, db: &RootDatabase) -> bool {
match self {
ExtendedVariant::Variant(var) => var.attrs(db).has_doc_hidden(),
_ => false,
}
}
}
fn lift_enum(e: hir::Enum) -> ExtendedEnum { fn lift_enum(e: hir::Enum) -> ExtendedEnum {
ExtendedEnum::Enum(e) ExtendedEnum::Enum(e)
} }
impl ExtendedEnum { impl ExtendedEnum {
fn is_non_exhaustive(self, db: &RootDatabase) -> bool {
match self {
ExtendedEnum::Enum(e) => e.attrs(db).by_key("non_exhaustive").exists(),
_ => false,
}
}
fn variants(self, db: &RootDatabase) -> Vec<ExtendedVariant> { fn variants(self, db: &RootDatabase) -> Vec<ExtendedVariant> {
match self { match self {
ExtendedEnum::Enum(e) => { ExtendedEnum::Enum(e) => {