Skip to content

Commit 4039176

Browse files
committed
Create basic support for names case checks and implement function name case check
1 parent 518f6d7 commit 4039176

File tree

6 files changed

+300
-3
lines changed

6 files changed

+300
-3
lines changed

crates/hir/src/code_model.rs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,37 @@ impl ModuleDef {
255255
ModuleDef::BuiltinType(it) => Some(it.as_name()),
256256
}
257257
}
258+
259+
pub fn diagnostics(self, db: &dyn HirDatabase, sink: &mut DiagnosticSink) {
260+
match self {
261+
ModuleDef::Adt(it) => match it {
262+
Adt::Struct(it) => {
263+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
264+
}
265+
Adt::Enum(it) => hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink),
266+
Adt::Union(it) => hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink),
267+
},
268+
ModuleDef::Trait(it) => {
269+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
270+
}
271+
ModuleDef::Function(it) => {
272+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
273+
}
274+
ModuleDef::TypeAlias(it) => {
275+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
276+
}
277+
ModuleDef::Module(it) => {
278+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
279+
}
280+
ModuleDef::Const(it) => {
281+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
282+
}
283+
ModuleDef::Static(it) => {
284+
hir_ty::diagnostics::validate_module_item(db, it.id.into(), sink)
285+
}
286+
_ => return,
287+
}
288+
}
258289
}
259290

260291
pub use hir_def::{

crates/hir_def/src/data.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use crate::{
1919
#[derive(Debug, Clone, PartialEq, Eq)]
2020
pub struct FunctionData {
2121
pub name: Name,
22+
pub param_names: Vec<Option<Name>>,
2223
pub params: Vec<TypeRef>,
2324
pub ret_type: TypeRef,
2425
pub attrs: Attrs,
@@ -39,6 +40,7 @@ impl FunctionData {
3940

4041
Arc::new(FunctionData {
4142
name: func.name.clone(),
43+
param_names: func.param_names.to_vec(),
4244
params: func.params.to_vec(),
4345
ret_type: func.ret_type.clone(),
4446
attrs: item_tree.attrs(ModItem::from(loc.id.value).into()).clone(),

crates/hir_def/src/item_tree.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,8 @@ pub struct Function {
507507
pub has_self_param: bool,
508508
pub has_body: bool,
509509
pub is_unsafe: bool,
510+
/// List of function parameters names. Does not include `self`.
511+
pub param_names: Box<[Option<Name>]>,
510512
pub params: Box<[TypeRef]>,
511513
pub is_varargs: bool,
512514
pub ret_type: TypeRef,

crates/hir_def/src/item_tree/lower.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ impl Ctx {
283283
let name = func.name()?.as_name();
284284

285285
let mut params = Vec::new();
286+
let mut param_names = Vec::new();
286287
let mut has_self_param = false;
287288
if let Some(param_list) = func.param_list() {
288289
if let Some(self_param) = param_list.self_param() {
@@ -305,6 +306,18 @@ impl Ctx {
305306
has_self_param = true;
306307
}
307308
for param in param_list.params() {
309+
let param_name = param
310+
.pat()
311+
.map(|name| {
312+
if let ast::Pat::IdentPat(ident) = name {
313+
Some(ident.name()?.as_name())
314+
} else {
315+
None
316+
}
317+
})
318+
.flatten();
319+
param_names.push(param_name);
320+
308321
let type_ref = TypeRef::from_ast_opt(&self.body_ctx, param.ty());
309322
params.push(type_ref);
310323
}
@@ -341,6 +354,7 @@ impl Ctx {
341354
has_body,
342355
is_unsafe: func.unsafe_token().is_some(),
343356
params: params.into_boxed_slice(),
357+
param_names: param_names.into_boxed_slice(),
344358
is_varargs,
345359
ret_type,
346360
ast_id,

crates/hir_ty/src/diagnostics.rs

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
mod expr;
33
mod match_check;
44
mod unsafe_check;
5+
mod decl_check;
56

6-
use std::any::Any;
7+
use std::{any::Any, fmt};
78

8-
use hir_def::DefWithBodyId;
9+
use hir_def::{DefWithBodyId, ModuleDefId};
910
use hir_expand::diagnostics::{Diagnostic, DiagnosticCode, DiagnosticSink};
1011
use hir_expand::{name::Name, HirFileId, InFile};
1112
use stdx::format_to;
@@ -15,6 +16,16 @@ use crate::db::HirDatabase;
1516

1617
pub use crate::diagnostics::expr::{record_literal_missing_fields, record_pattern_missing_fields};
1718

19+
pub fn validate_module_item(
20+
db: &dyn HirDatabase,
21+
owner: ModuleDefId,
22+
sink: &mut DiagnosticSink<'_>,
23+
) {
24+
let _p = profile::span("validate_body");
25+
let mut validator = decl_check::DeclValidator::new(owner, sink);
26+
validator.validate_item(db);
27+
}
28+
1829
pub fn validate_body(db: &dyn HirDatabase, owner: DefWithBodyId, sink: &mut DiagnosticSink<'_>) {
1930
let _p = profile::span("validate_body");
2031
let infer = db.infer(owner);
@@ -231,6 +242,64 @@ impl Diagnostic for MismatchedArgCount {
231242
}
232243
}
233244

245+
#[derive(Debug)]
246+
pub enum CaseType {
247+
// `some_var`
248+
LowerSnakeCase,
249+
// `SOME_CONST`
250+
UpperSnakeCase,
251+
// `SomeStruct`
252+
UpperCamelCase,
253+
}
254+
255+
impl fmt::Display for CaseType {
256+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
257+
let repr = match self {
258+
CaseType::LowerSnakeCase => "snake_case",
259+
CaseType::UpperSnakeCase => "UPPER_SNAKE_CASE",
260+
CaseType::UpperCamelCase => "UpperCamelCase",
261+
};
262+
263+
write!(f, "{}", repr)
264+
}
265+
}
266+
267+
#[derive(Debug)]
268+
pub struct IncorrectCase {
269+
pub file: HirFileId,
270+
pub ident: SyntaxNodePtr,
271+
pub expected_case: CaseType,
272+
pub ident_text: String,
273+
pub suggested_text: String,
274+
}
275+
276+
impl Diagnostic for IncorrectCase {
277+
fn code(&self) -> DiagnosticCode {
278+
DiagnosticCode("incorrect-ident-case")
279+
}
280+
281+
fn message(&self) -> String {
282+
format!(
283+
"Argument `{}` should have a {} name, e.g. `{}`",
284+
self.ident_text,
285+
self.expected_case.to_string(),
286+
self.suggested_text
287+
)
288+
}
289+
290+
fn display_source(&self) -> InFile<SyntaxNodePtr> {
291+
InFile::new(self.file, self.ident.clone())
292+
}
293+
294+
fn as_any(&self) -> &(dyn Any + Send + 'static) {
295+
self
296+
}
297+
298+
fn is_experimental(&self) -> bool {
299+
true
300+
}
301+
}
302+
234303
#[cfg(test)]
235304
mod tests {
236305
use base_db::{fixture::WithFixture, FileId, SourceDatabase, SourceDatabaseExt};
@@ -242,7 +311,10 @@ mod tests {
242311
use rustc_hash::FxHashMap;
243312
use syntax::{TextRange, TextSize};
244313

245-
use crate::{diagnostics::validate_body, test_db::TestDB};
314+
use crate::{
315+
diagnostics::{validate_body, validate_module_item},
316+
test_db::TestDB,
317+
};
246318

247319
impl TestDB {
248320
fn diagnostics<F: FnMut(&dyn Diagnostic)>(&self, mut cb: F) {
@@ -253,6 +325,9 @@ mod tests {
253325
let mut fns = Vec::new();
254326
for (module_id, _) in crate_def_map.modules.iter() {
255327
for decl in crate_def_map[module_id].scope.declarations() {
328+
let mut sink = DiagnosticSinkBuilder::new().build(&mut cb);
329+
validate_module_item(self, decl, &mut sink);
330+
256331
if let ModuleDefId::FunctionId(f) = decl {
257332
fns.push(f)
258333
}
Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
//! Provides validators for the item declarations.
2+
//! This includes the following items:
3+
//! - variable bindings (e.g. `let x = foo();`)
4+
//! - struct fields (e.g. `struct Foo { field: u8 }`)
5+
//! - enum fields (e.g. `enum Foo { Variant { field: u8 } }`)
6+
//! - function/method arguments (e.g. `fn foo(arg: u8)`)
7+
8+
// TODO: Temporary, to not see warnings until module is somewhat complete.
9+
// If you see these lines in the pull request, feel free to call me stupid :P.
10+
#![allow(dead_code, unused_imports, unused_variables)]
11+
12+
use std::sync::Arc;
13+
14+
use hir_def::{
15+
body::Body,
16+
db::DefDatabase,
17+
expr::{Expr, ExprId, UnaryOp},
18+
item_tree::ItemTreeNode,
19+
resolver::{resolver_for_expr, ResolveValueResult, ValueNs},
20+
src::HasSource,
21+
AdtId, FunctionId, Lookup, ModuleDefId,
22+
};
23+
use hir_expand::{diagnostics::DiagnosticSink, name::Name};
24+
use syntax::{ast::NameOwner, AstPtr};
25+
26+
use crate::{
27+
db::HirDatabase,
28+
diagnostics::{CaseType, IncorrectCase},
29+
lower::CallableDefId,
30+
ApplicationTy, InferenceResult, Ty, TypeCtor,
31+
};
32+
33+
pub(super) struct DeclValidator<'a, 'b: 'a> {
34+
owner: ModuleDefId,
35+
sink: &'a mut DiagnosticSink<'b>,
36+
}
37+
38+
#[derive(Debug)]
39+
struct Replacement {
40+
current_name: Name,
41+
suggested_text: String,
42+
expected_case: CaseType,
43+
}
44+
45+
impl<'a, 'b> DeclValidator<'a, 'b> {
46+
pub(super) fn new(
47+
owner: ModuleDefId,
48+
sink: &'a mut DiagnosticSink<'b>,
49+
) -> DeclValidator<'a, 'b> {
50+
DeclValidator { owner, sink }
51+
}
52+
53+
pub(super) fn validate_item(&mut self, db: &dyn HirDatabase) {
54+
// let def = self.owner.into();
55+
match self.owner {
56+
ModuleDefId::FunctionId(func) => self.validate_func(db, func),
57+
ModuleDefId::AdtId(adt) => self.validate_adt(db, adt),
58+
_ => return,
59+
}
60+
}
61+
62+
fn validate_func(&mut self, db: &dyn HirDatabase, func: FunctionId) {
63+
let data = db.function_data(func);
64+
65+
// 1. Check the function name.
66+
let function_name = data.name.to_string();
67+
let fn_name_replacement = if let Some(new_name) = to_lower_snake_case(&function_name) {
68+
let replacement = Replacement {
69+
current_name: data.name.clone(),
70+
suggested_text: new_name,
71+
expected_case: CaseType::LowerSnakeCase,
72+
};
73+
Some(replacement)
74+
} else {
75+
None
76+
};
77+
78+
// 2. Check the param names.
79+
let mut fn_param_replacements = Vec::new();
80+
81+
for param_name in data.param_names.iter().cloned().filter_map(|i| i) {
82+
let name = param_name.to_string();
83+
if let Some(new_name) = to_lower_snake_case(&name) {
84+
let replacement = Replacement {
85+
current_name: param_name,
86+
suggested_text: new_name,
87+
expected_case: CaseType::LowerSnakeCase,
88+
};
89+
fn_param_replacements.push(replacement);
90+
}
91+
}
92+
93+
// 3. If there is at least one element to spawn a warning on, go to the source map and generate a warning.
94+
self.create_incorrect_case_diagnostic_for_func(
95+
func,
96+
db,
97+
fn_name_replacement,
98+
fn_param_replacements,
99+
)
100+
}
101+
102+
/// Given the information about incorrect names in the function declaration, looks up into the source code
103+
/// for exact locations and adds diagnostics into the sink.
104+
fn create_incorrect_case_diagnostic_for_func(
105+
&mut self,
106+
func: FunctionId,
107+
db: &dyn HirDatabase,
108+
fn_name_replacement: Option<Replacement>,
109+
fn_param_replacements: Vec<Replacement>,
110+
) {
111+
// XXX: only look at sources if we do have incorrect names
112+
if fn_name_replacement.is_none() && fn_param_replacements.is_empty() {
113+
return;
114+
}
115+
116+
let fn_loc = func.lookup(db.upcast());
117+
let fn_src = fn_loc.source(db.upcast());
118+
119+
if let Some(replacement) = fn_name_replacement {
120+
let ast_ptr = if let Some(name) = fn_src.value.name() {
121+
name
122+
} else {
123+
// We don't want rust-analyzer to panic over this, but it is definitely some kind of error in the logic.
124+
log::error!(
125+
"Replacement was generated for a function without a name: {:?}",
126+
fn_src
127+
);
128+
return;
129+
};
130+
131+
let diagnostic = IncorrectCase {
132+
file: fn_src.file_id,
133+
ident: AstPtr::new(&ast_ptr).into(),
134+
expected_case: replacement.expected_case,
135+
ident_text: replacement.current_name.to_string(),
136+
suggested_text: replacement.suggested_text,
137+
};
138+
139+
self.sink.push(diagnostic);
140+
}
141+
142+
// let item_tree = db.item_tree(loc.id.file_id);
143+
// let fn_def = &item_tree[fn_loc.id.value];
144+
// let (_, source_map) = db.body_with_source_map(func.into());
145+
}
146+
147+
fn validate_adt(&mut self, db: &dyn HirDatabase, adt: AdtId) {}
148+
}
149+
150+
fn to_lower_snake_case(ident: &str) -> Option<String> {
151+
let lower_snake_case = stdx::to_lower_snake_case(ident);
152+
153+
if lower_snake_case == ident {
154+
None
155+
} else {
156+
Some(lower_snake_case)
157+
}
158+
}
159+
160+
#[cfg(test)]
161+
mod tests {
162+
use crate::diagnostics::tests::check_diagnostics;
163+
164+
#[test]
165+
fn incorrect_function_name() {
166+
check_diagnostics(
167+
r#"
168+
fn NonSnakeCaseName() {}
169+
// ^^^^^^^^^^^^^^^^ Argument `NonSnakeCaseName` should have a snake_case name, e.g. `non_snake_case_name`
170+
"#,
171+
);
172+
}
173+
}

0 commit comments

Comments
 (0)