feat: Add incorrect case diagnostics for enum variant fields and all variables

This commit is contained in:
Campbell 2024-07-13 21:54:22 +12:00
parent ffbc5ad993
commit af30111b1c
3 changed files with 194 additions and 31 deletions

View file

@ -17,8 +17,8 @@ use std::fmt;
use hir_def::{
data::adt::VariantData, db::DefDatabase, hir::Pat, src::HasSource, AdtId, AttrDefId, ConstId,
EnumId, FunctionId, ItemContainerId, Lookup, ModuleDefId, ModuleId, StaticId, StructId,
TraitId, TypeAliasId,
EnumId, EnumVariantId, FunctionId, ItemContainerId, Lookup, ModuleDefId, ModuleId, StaticId,
StructId, TraitId, TypeAliasId,
};
use hir_expand::{
name::{AsName, Name},
@ -353,17 +353,16 @@ impl<'a> DeclValidator<'a> {
continue;
};
let is_param = ast::Param::can_cast(parent.kind());
// We have to check that it's either `let var = ...` or `var @ Variant(_)` statement,
// because e.g. match arms are patterns as well.
// In other words, we check that it's a named variable binding.
let is_binding = ast::LetStmt::can_cast(parent.kind())
|| (ast::MatchArm::can_cast(parent.kind()) && ident_pat.at_token().is_some());
if !(is_param || is_binding) {
// This pattern is not an actual variable declaration, e.g. `Some(val) => {..}` match arm.
let is_shorthand = ast::RecordPatField::cast(parent.clone())
.map(|parent| parent.name_ref().is_none())
.unwrap_or_default();
if is_shorthand {
// We don't check shorthand field patterns, such as 'field' in `Thing { field }`,
// since the shorthand isn't the declaration.
continue;
}
let is_param = ast::Param::can_cast(parent.kind());
let ident_type = if is_param { IdentType::Parameter } else { IdentType::Variable };
self.create_incorrect_case_diagnostic_for_ast_node(
@ -489,6 +488,11 @@ impl<'a> DeclValidator<'a> {
/// Check incorrect names for enum variants.
fn validate_enum_variants(&mut self, enum_id: EnumId) {
let data = self.db.enum_data(enum_id);
for (variant_id, _) in data.variants.iter() {
self.validate_enum_variant_fields(*variant_id);
}
let mut enum_variants_replacements = data
.variants
.iter()
@ -551,6 +555,75 @@ impl<'a> DeclValidator<'a> {
}
}
/// Check incorrect names for fields of enum variant.
fn validate_enum_variant_fields(&mut self, variant_id: EnumVariantId) {
let variant_data = self.db.enum_variant_data(variant_id);
let VariantData::Record(fields) = variant_data.variant_data.as_ref() else {
return;
};
let mut variant_field_replacements = fields
.iter()
.filter_map(|(_, field)| {
to_lower_snake_case(&field.name.to_smol_str()).map(|new_name| Replacement {
current_name: field.name.clone(),
suggested_text: new_name,
expected_case: CaseType::LowerSnakeCase,
})
})
.peekable();
// XXX: only look at sources if we do have incorrect names
if variant_field_replacements.peek().is_none() {
return;
}
let variant_loc = variant_id.lookup(self.db.upcast());
let variant_src = variant_loc.source(self.db.upcast());
let Some(ast::FieldList::RecordFieldList(variant_fields_list)) =
variant_src.value.field_list()
else {
always!(
variant_field_replacements.peek().is_none(),
"Replacements ({:?}) were generated for an enum variant \
which had no fields list: {:?}",
variant_field_replacements.collect::<Vec<_>>(),
variant_src
);
return;
};
let mut variant_variants_iter = variant_fields_list.fields();
for field_replacement in variant_field_replacements {
// We assume that parameters in replacement are in the same order as in the
// actual params list, but just some of them (ones that named correctly) are skipped.
let field = loop {
if let Some(field) = variant_variants_iter.next() {
let Some(field_name) = field.name() else {
continue;
};
if field_name.as_name() == field_replacement.current_name {
break field;
}
} else {
never!(
"Replacement ({:?}) was generated for an enum variant field \
which was not found: {:?}",
field_replacement,
variant_src
);
return;
}
};
self.create_incorrect_case_diagnostic_for_ast_node(
field_replacement,
variant_src.file_id,
&field,
IdentType::Field,
);
}
}
fn validate_const(&mut self, const_id: ConstId) {
let container = const_id.lookup(self.db.upcast()).container;
if self.is_trait_impl_container(container) {