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 overridden function reporting for CanBeNonNullable rule #4497

Merged
merged 1 commit into from Jan 19, 2022
Merged

Fix overridden function reporting for CanBeNonNullable rule #4497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ...t-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/CanBeNonNullable.kt
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ import io.gitlab.arturbosch.detekt.api.internal.RequiresTypeResolution
import io.gitlab.arturbosch.detekt.rules.isNonNullCheck
import io.gitlab.arturbosch.detekt.rules.isNullCheck
import io.gitlab.arturbosch.detekt.rules.isOpen
import io.gitlab.arturbosch.detekt.rules.isOverride
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
Expand Down Expand Up @@ -124,6 +125,10 @@ class CanBeNonNullable(config: Config = Config.empty) : Rule(config) {
private val nullableParams = mutableMapOf<DeclarationDescriptor, NullableParam>()

override fun visitNamedFunction(function: KtNamedFunction) {
if (function.isOverride()) {
return
}

val candidateDescriptors = mutableSetOf<DeclarationDescriptor>()
function.valueParameters.asSequence()
.filter {
Expand Down
15 changes: 15 additions & 0 deletions ...les-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/CanBeNonNullableSpec.kt
View file
Open in desktop
Expand Up @@ -426,6 +426,21 @@ class CanBeNonNullableSpec : Spek({
""".trimIndent()
assertThat(subject.compileAndLintWithContext(env, code)).isEmpty()
}

it("does not report on overridden function parameter") {
val code = """
interface A {
fun foo(a: Int?)
}

class B : A {
override fun foo(a: Int?) {
val b = a!! + 2
}
}
""".trimIndent()
assertThat(subject.compileAndLintWithContext(env, code)).isEmpty()
}
}

context("using a null-safe expression") {
Expand Down