Skip to content

Commit

Permalink
VarCouldBeVal: Add configuration flag ignoreLateinitVar (#4745)
Browse files Browse the repository at this point in the history
  • Loading branch information
rli committed Apr 24, 2022
1 parent b8bc050 commit 1e506d3
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 3 deletions.
1 change: 1 addition & 0 deletions detekt-core/src/main/resources/default-detekt-config.yml
Expand Up @@ -675,6 +675,7 @@ style:
active: true
VarCouldBeVal:
active: true
ignoreLateinitVar: false
WildcardImport:
active: true
excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
Expand Down
Expand Up @@ -8,8 +8,11 @@ import io.gitlab.arturbosch.detekt.api.Entity
import io.gitlab.arturbosch.detekt.api.Issue
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.ActiveByDefault
import io.gitlab.arturbosch.detekt.api.internal.Configuration
import io.gitlab.arturbosch.detekt.api.internal.RequiresTypeResolution
import io.gitlab.arturbosch.detekt.rules.isLateinit
import io.gitlab.arturbosch.detekt.rules.isOverride
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.lexer.KtTokens
Expand Down Expand Up @@ -68,10 +71,13 @@ class VarCouldBeVal(config: Config = Config.empty) : Rule(config) {
Debt.FIVE_MINS
)

@Configuration("Whether to ignore uninitialized lateinit vars")
private val ignoreLateinitVar: Boolean by config(defaultValue = false)

override fun visitKtFile(file: KtFile) {
super.visitKtFile(file)
if (bindingContext == BindingContext.EMPTY) return
val assignmentVisitor = AssignmentVisitor(bindingContext)
val assignmentVisitor = AssignmentVisitor(bindingContext, ignoreLateinitVar)
file.accept(assignmentVisitor)

assignmentVisitor.getNonReAssignedDeclarations().forEach {
Expand All @@ -80,7 +86,10 @@ class VarCouldBeVal(config: Config = Config.empty) : Rule(config) {
}

@Suppress("TooManyFunctions")
private class AssignmentVisitor(private val bindingContext: BindingContext) : DetektVisitor() {
private class AssignmentVisitor(
private val bindingContext: BindingContext,
private val ignoreLateinitVar: Boolean
) : DetektVisitor() {

private val declarationCandidates = mutableSetOf<KtNamedDeclaration>()
private val assignments = mutableMapOf<String, MutableSet<KtExpression>>()
Expand Down Expand Up @@ -197,7 +206,7 @@ class VarCouldBeVal(config: Config = Config.empty) : Rule(config) {

private fun KtProperty.isDeclarationCandidate(): Boolean {
return when {
!isVar || isOverride() -> false
!isVar || isOverride() || (ignoreLateinitVar && isLateinit()) -> false
isLocal || isPrivate() -> true
else -> {
// Check for whether property belongs to an anonymous object
Expand Down
@@ -1,6 +1,7 @@
package io.gitlab.arturbosch.detekt.rules.style

import io.gitlab.arturbosch.detekt.rules.KotlinCoreEnvironmentTest
import io.gitlab.arturbosch.detekt.test.TestConfig
import io.gitlab.arturbosch.detekt.test.compileAndLint
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
import org.assertj.core.api.Assertions.assertThat
Expand Down Expand Up @@ -491,4 +492,24 @@ class VarCouldBeValSpec(val env: KotlinCoreEnvironment) {
}
}
}

@Nested
inner class `lateinit vars - #4731` {
val code = """
public class A {
private lateinit var test: String
}
""".trimIndent()

@Test
fun `reports uninitialized lateinit vars by default`() {
assertThat(subject.compileAndLintWithContext(env, code)).hasSize(1)
}

@Test
fun `does not report uninitialized lateinit vars if disabled in config`() {
val subject = VarCouldBeVal(TestConfig("ignoreLateinitVar" to true))
assertThat(subject.compileAndLintWithContext(env, code)).isEmpty()
}
}
}

0 comments on commit 1e506d3

Please sign in to comment.