Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/red-baboons-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@biomejs/biome": patch
---

Fixed [#6695](https://github.com/biomejs/biome/issues/6695): [`useNamingConvention`](https://biomejs.dev/linter/rules/use-naming-convention/) now correctly reports TypeScript parameter properties with modifiers.

Previously, constructor parameter properties with modifiers like `private` or `readonly` were not checked against naming conventions. These properties are now treated consistently with regular class properties.
13 changes: 12 additions & 1 deletion crates/biome_js_analyze/src/lint/style/use_naming_convention.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,18 @@ fn selector_from_binding_declaration(decl: &AnyJsBindingDeclaration) -> Option<S
| AnyJsBindingDeclaration::JsFormalParameter(_)
| AnyJsBindingDeclaration::JsRestParameter(_) => Some(Kind::FunctionParameter.into()),
AnyJsBindingDeclaration::JsCatchDeclaration(_) => Some(Kind::CatchParameter.into()),
AnyJsBindingDeclaration::TsPropertyParameter(_) => Some(Kind::ClassProperty.into()),
AnyJsBindingDeclaration::TsPropertyParameter(param) => {
let modifiers: BitFlags<Modifier> = (&param.modifiers()).into();
if modifiers.contains(Modifier::Override) {
// Ignore explicitly overridden members
None
} else {
Some(Selector::with_modifiers(
Kind::ClassProperty,
to_restricted_modifiers(modifiers),
))
}
},
AnyJsBindingDeclaration::TsIndexSignatureParameter(member_name) => {
if let Some(member) = member_name.parent::<>() {
selector_from_class_member(&member)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"$schema": "../../../../../../packages/@biomejs/biome/configuration_schema.json",
"linter": {
"rules": {
"style": {
"useNamingConvention": {
"level": "error",
"options": {
"strictCase": false,
"requireAscii": true,
"conventions": [
{
"selector": {
"kind": "classProperty",
"modifiers": ["private", "readonly"]
},
"formats": ["CONSTANT_CASE", "camelCase"],
"match": "_(.+)"
},
{
"selector": {
"kind": "classProperty",
"modifiers": ["private"]
},
"formats": ["camelCase"],
"match": "_(.+)"
},
{
"selector": {
"kind": "classMember",
"modifiers": ["private"]
},
"match": "_(.+)"
}
]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class SomeClass {
private readonly _private: string;
private readonly _private2: string;

// invalid, should have an underscore according to rules
constructor(private readonly private3: string) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
source: crates/biome_js_analyze/tests/spec_tests.rs
expression: invalidParameterPropertyWithModifiers.ts
---
# Input
```ts
class SomeClass {
private readonly _private: string;
private readonly _private2: string;

// invalid, should have an underscore according to rules
constructor(private readonly private3: string) {}
}
```

# Diagnostics
```
invalidParameterPropertyWithModifiers.ts:6:31 lint/style/useNamingConvention ━━━━━━━━━━━━━━━━━━━━━━━

i This private readonly class property name should match the following regex /_(.+)/.

5 │ // invalid, should have an underscore according to rules
> 6 │ constructor(private readonly private3: string) {}
│ ^^^^^^^^
7 │ }


```
8 changes: 8 additions & 0 deletions crates/biome_js_syntax/src/modifier_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,14 @@ impl From<&TsMethodSignatureModifierList> for enumflags2::BitFlags<Modifier> {
.fold(Self::empty(), |acc, m| acc | m)
}
}
impl From<&crate::TsPropertyParameterModifierList> for enumflags2::BitFlags<Modifier> {
fn from(value: &crate::TsPropertyParameterModifierList) -> Self {
value
.into_iter()
.map(|m| Modifier::from(&m))
.fold(Self::empty(), |acc, m| acc | m)
}
}

/// Helpful data structure to make the order of type parameter modifiers predictable inside the formatter
#[derive(Debug, Ord, PartialOrd, Eq, PartialEq)]
Expand Down
Loading