mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-27 21:43:37 +00:00
feat: array match
This commit is contained in:
parent
3a72713365
commit
8fa69f9f7d
3 changed files with 157 additions and 11 deletions
|
@ -50,6 +50,7 @@ use hir_def::{
|
||||||
per_ns::PerNs,
|
per_ns::PerNs,
|
||||||
resolver::{HasResolver, Resolver},
|
resolver::{HasResolver, Resolver},
|
||||||
src::HasSource as _,
|
src::HasSource as _,
|
||||||
|
type_ref::ConstScalar,
|
||||||
AdtId, AssocItemId, AssocItemLoc, AttrDefId, ConstId, ConstParamId, DefWithBodyId, EnumId,
|
AdtId, AssocItemId, AssocItemLoc, AttrDefId, ConstId, ConstParamId, DefWithBodyId, EnumId,
|
||||||
EnumVariantId, FunctionId, GenericDefId, HasModule, ImplId, ItemContainerId, LifetimeParamId,
|
EnumVariantId, FunctionId, GenericDefId, HasModule, ImplId, ItemContainerId, LifetimeParamId,
|
||||||
LocalEnumVariantId, LocalFieldId, Lookup, MacroExpander, MacroId, ModuleId, StaticId, StructId,
|
LocalEnumVariantId, LocalFieldId, Lookup, MacroExpander, MacroId, ModuleId, StaticId, StructId,
|
||||||
|
@ -65,8 +66,9 @@ use hir_ty::{
|
||||||
primitive::UintTy,
|
primitive::UintTy,
|
||||||
traits::FnTrait,
|
traits::FnTrait,
|
||||||
AliasTy, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, Cast, ClosureId,
|
AliasTy, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, Cast, ClosureId,
|
||||||
GenericArgData, Interner, ParamKind, QuantifiedWhereClause, Scalar, Substitution,
|
ConcreteConst, ConstValue, GenericArgData, Interner, ParamKind, QuantifiedWhereClause, Scalar,
|
||||||
TraitEnvironment, TraitRefExt, Ty, TyBuilder, TyDefId, TyExt, TyKind, WhereClause,
|
Substitution, TraitEnvironment, TraitRefExt, Ty, TyBuilder, TyDefId, TyExt, TyKind,
|
||||||
|
WhereClause,
|
||||||
};
|
};
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use nameres::diagnostics::DefDiagnosticKind;
|
use nameres::diagnostics::DefDiagnosticKind;
|
||||||
|
@ -3232,6 +3234,19 @@ impl Type {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn as_array(&self, _db: &dyn HirDatabase) -> Option<(Type, usize)> {
|
||||||
|
if let TyKind::Array(ty, len) = &self.ty.kind(Interner) {
|
||||||
|
match len.data(Interner).value {
|
||||||
|
ConstValue::Concrete(ConcreteConst { interned: ConstScalar::UInt(len) }) => {
|
||||||
|
Some((self.derived(ty.clone()), len as usize))
|
||||||
|
}
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn autoderef<'a>(&'a self, db: &'a dyn HirDatabase) -> impl Iterator<Item = Type> + 'a {
|
pub fn autoderef<'a>(&'a self, db: &'a dyn HirDatabase) -> impl Iterator<Item = Type> + 'a {
|
||||||
self.autoderef_(db).map(move |ty| self.derived(ty))
|
self.autoderef_(db).map(move |ty| self.derived(ty))
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,31 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
|
||||||
})
|
})
|
||||||
.filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat));
|
.filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat));
|
||||||
((Box::new(missing_pats) as Box<dyn Iterator<Item = _>>).peekable(), is_non_exhaustive)
|
((Box::new(missing_pats) as Box<dyn Iterator<Item = _>>).peekable(), is_non_exhaustive)
|
||||||
|
} else if let Some((enum_def, len)) = resolve_array_of_enum_def(&ctx.sema, &expr) {
|
||||||
|
let is_non_exhaustive = enum_def.is_non_exhaustive(ctx.db(), module.krate());
|
||||||
|
let variants = enum_def.variants(ctx.db());
|
||||||
|
|
||||||
|
if len.pow(variants.len() as u32) > 256 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let variants_of_enums = vec![variants.clone(); len];
|
||||||
|
|
||||||
|
let missing_pats = variants_of_enums
|
||||||
|
.into_iter()
|
||||||
|
.multi_cartesian_product()
|
||||||
|
.inspect(|_| cov_mark::hit!(add_missing_match_arms_lazy_computation))
|
||||||
|
.map(|variants| {
|
||||||
|
let is_hidden = variants
|
||||||
|
.iter()
|
||||||
|
.any(|variant| variant.should_be_hidden(ctx.db(), module.krate()));
|
||||||
|
let patterns = variants.into_iter().filter_map(|variant| {
|
||||||
|
build_pat(ctx.db(), module, variant.clone(), ctx.config.prefer_no_std)
|
||||||
|
});
|
||||||
|
(ast::Pat::from(make::slice_pat(patterns)), is_hidden)
|
||||||
|
})
|
||||||
|
.filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat));
|
||||||
|
((Box::new(missing_pats) as Box<dyn Iterator<Item = _>>).peekable(), is_non_exhaustive)
|
||||||
} else {
|
} else {
|
||||||
return None;
|
return None;
|
||||||
};
|
};
|
||||||
|
@ -266,6 +291,9 @@ fn is_variant_missing(existing_pats: &[Pat], var: &Pat) -> bool {
|
||||||
fn does_pat_match_variant(pat: &Pat, var: &Pat) -> bool {
|
fn does_pat_match_variant(pat: &Pat, var: &Pat) -> bool {
|
||||||
match (pat, var) {
|
match (pat, var) {
|
||||||
(Pat::WildcardPat(_), _) => true,
|
(Pat::WildcardPat(_), _) => true,
|
||||||
|
(Pat::SlicePat(spat), Pat::SlicePat(svar)) => {
|
||||||
|
spat.pats().zip(svar.pats()).all(|(p, v)| does_pat_match_variant(&p, &v))
|
||||||
|
}
|
||||||
(Pat::TuplePat(tpat), Pat::TuplePat(tvar)) => {
|
(Pat::TuplePat(tpat), Pat::TuplePat(tvar)) => {
|
||||||
tpat.fields().zip(tvar.fields()).all(|(p, v)| does_pat_match_variant(&p, &v))
|
tpat.fields().zip(tvar.fields()).all(|(p, v)| does_pat_match_variant(&p, &v))
|
||||||
}
|
}
|
||||||
|
@ -280,7 +308,7 @@ enum ExtendedEnum {
|
||||||
Enum(hir::Enum),
|
Enum(hir::Enum),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Eq, PartialEq, Clone, Copy)]
|
#[derive(Eq, PartialEq, Clone, Copy, Debug)]
|
||||||
enum ExtendedVariant {
|
enum ExtendedVariant {
|
||||||
True,
|
True,
|
||||||
False,
|
False,
|
||||||
|
@ -340,15 +368,30 @@ fn resolve_tuple_of_enum_def(
|
||||||
.tuple_fields(sema.db)
|
.tuple_fields(sema.db)
|
||||||
.iter()
|
.iter()
|
||||||
.map(|ty| {
|
.map(|ty| {
|
||||||
ty.autoderef(sema.db).find_map(|ty| match ty.as_adt() {
|
ty.autoderef(sema.db).find_map(|ty| {
|
||||||
|
match ty.as_adt() {
|
||||||
Some(Adt::Enum(e)) => Some(lift_enum(e)),
|
Some(Adt::Enum(e)) => Some(lift_enum(e)),
|
||||||
// For now we only handle expansion for a tuple of enums. Here
|
// For now we only handle expansion for a tuple of enums. Here
|
||||||
// we map non-enum items to None and rely on `collect` to
|
// we map non-enum items to None and rely on `collect` to
|
||||||
// convert Vec<Option<hir::Enum>> into Option<Vec<hir::Enum>>.
|
// convert Vec<Option<hir::Enum>> into Option<Vec<hir::Enum>>.
|
||||||
_ => ty.is_bool().then_some(ExtendedEnum::Bool),
|
_ => ty.is_bool().then_some(ExtendedEnum::Bool),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect::<Option<Vec<ExtendedEnum>>>()
|
||||||
|
.and_then(|list| if list.is_empty() { None } else { Some(list) })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve_array_of_enum_def(
|
||||||
|
sema: &Semantics<'_, RootDatabase>,
|
||||||
|
expr: &ast::Expr,
|
||||||
|
) -> Option<(ExtendedEnum, usize)> {
|
||||||
|
sema.type_of_expr(expr)?.adjusted().as_array(sema.db).and_then(|(ty, len)| {
|
||||||
|
ty.autoderef(sema.db).find_map(|ty| match ty.as_adt() {
|
||||||
|
Some(Adt::Enum(e)) => Some((lift_enum(e), len)),
|
||||||
|
_ => ty.is_bool().then_some((ExtendedEnum::Bool, len)),
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.collect()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_pat(
|
fn build_pat(
|
||||||
|
@ -377,7 +420,6 @@ fn build_pat(
|
||||||
}
|
}
|
||||||
ast::StructKind::Unit => make::path_pat(path),
|
ast::StructKind::Unit => make::path_pat(path),
|
||||||
};
|
};
|
||||||
|
|
||||||
Some(pat)
|
Some(pat)
|
||||||
}
|
}
|
||||||
ExtendedVariant::True => Some(ast::Pat::from(make::literal_pat("true"))),
|
ExtendedVariant::True => Some(ast::Pat::from(make::literal_pat("true"))),
|
||||||
|
@ -573,6 +615,86 @@ fn foo(a: bool) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fill_boolean_array() {
|
||||||
|
check_assist(
|
||||||
|
add_missing_match_arms,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a]$0 {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a] {
|
||||||
|
$0[true] => todo!(),
|
||||||
|
[false] => todo!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
);
|
||||||
|
|
||||||
|
check_assist(
|
||||||
|
add_missing_match_arms,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a,]$0 {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a,] {
|
||||||
|
$0[true] => todo!(),
|
||||||
|
[false] => todo!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
);
|
||||||
|
|
||||||
|
check_assist(
|
||||||
|
add_missing_match_arms,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a, a]$0 {
|
||||||
|
[true, true] => todo!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a, a] {
|
||||||
|
[true, true] => todo!(),
|
||||||
|
$0[true, false] => todo!(),
|
||||||
|
[false, true] => todo!(),
|
||||||
|
[false, false] => todo!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
);
|
||||||
|
|
||||||
|
check_assist(
|
||||||
|
add_missing_match_arms,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a, a]$0 {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
r#"
|
||||||
|
fn foo(a: bool) {
|
||||||
|
match [a, a] {
|
||||||
|
$0[true, true] => todo!(),
|
||||||
|
[true, false] => todo!(),
|
||||||
|
[false, true] => todo!(),
|
||||||
|
[false, false] => todo!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn partial_fill_boolean_tuple() {
|
fn partial_fill_boolean_tuple() {
|
||||||
check_assist(
|
check_assist(
|
||||||
|
|
|
@ -520,6 +520,15 @@ pub fn literal_pat(lit: &str) -> ast::LiteralPat {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn slice_pat(pats: impl IntoIterator<Item = ast::Pat>) -> ast::SlicePat {
|
||||||
|
let pats_str = pats.into_iter().join(", ");
|
||||||
|
return from_text(&format!("[{pats_str}]"));
|
||||||
|
|
||||||
|
fn from_text(text: &str) -> ast::SlicePat {
|
||||||
|
ast_from_text(&format!("fn f() {{ match () {{{text} => ()}} }}"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Creates a tuple of patterns from an iterator of patterns.
|
/// Creates a tuple of patterns from an iterator of patterns.
|
||||||
///
|
///
|
||||||
/// Invariant: `pats` must be length > 0
|
/// Invariant: `pats` must be length > 0
|
||||||
|
|
Loading…
Reference in a new issue