Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix LambdaParameterNaming rule false positive #5465

Merged
merged 3 commits into from Oct 23, 2022
Merged

Fix LambdaParameterNaming rule false positive #5465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d1b55b
fix: lambda parameter naming false positive
sanggggg Oct 22, 2022
fdf31a8
fix: detekt correct
sanggggg Oct 22, 2022
37c5c4c
fix: test snippet compile error
sanggggg Oct 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...-naming/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/naming/LambdaParameterNaming.kt
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import io.gitlab.arturbosch.detekt.api.Rule
import io.gitlab.arturbosch.detekt.api.Severity
import io.gitlab.arturbosch.detekt.api.config
import io.gitlab.arturbosch.detekt.api.internal.Configuration
import org.jetbrains.kotlin.psi.KtLambdaExpression
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.psi.KtParameter

Expand All @@ -27,9 +28,10 @@ class LambdaParameterNaming(config: Config = Config.empty) : Rule(config) {
@Configuration("naming pattern")
private val parameterPattern: Regex by config("[a-z][A-Za-z0-9]*|_", String::toRegex)

override fun visitParameter(parameter: KtParameter) {
val parameters: List<KtNamedDeclaration> = parameter.destructuringDeclaration?.entries ?: listOf(parameter)
parameters
override fun visitLambdaExpression(lambdaExpression: KtLambdaExpression) {
super.visitLambdaExpression(lambdaExpression)
lambdaExpression.valueParameters
.flatMap { it.getNamedDeclarations() }
.mapNotNull { it.nameIdentifier }
.forEach {
val identifier = it.text
Expand All @@ -44,4 +46,8 @@ class LambdaParameterNaming(config: Config = Config.empty) : Rule(config) {
}
}
}

private fun KtParameter.getNamedDeclarations(): List<KtNamedDeclaration> {
return this.destructuringDeclaration?.entries ?: listOf(this)
}
}
18 changes: 18 additions & 0 deletions ...ing/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/naming/LambdaParameterNamingSpec.kt
View file
Open in desktop
Expand Up @@ -122,4 +122,22 @@ class LambdaParameterNamingSpec {
assertThat(LambdaParameterNaming().compileAndLint(code))
.isEmpty()
}

@Test
fun `Doesn't report invalid class constructor parameters`() {
val code = """
data class C(val _invalid: String)
""".trimIndent()
assertThat(LambdaParameterNaming().compileAndLint(code))
.isEmpty()
}

@Test
fun `Doesn't report invalid function parameters`() {
val code = """
fun f(_invalid: String) = Unit
""".trimIndent()
assertThat(LambdaParameterNaming().compileAndLint(code))
.isEmpty()
}
}