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

Report LabeledExpression as the label instead of the whole expression #5351

Merged
merged 1 commit into from Sep 25, 2022
Merged

Report LabeledExpression as the label instead of the whole expression #5351

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
8 changes: 4 additions & 4 deletions ...plexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/LabeledExpression.kt
View file
Open in desktop
Expand Up @@ -76,10 +76,10 @@ class LabeledExpression(config: Config = Config.empty) : Rule(config) {
override fun visitExpressionWithLabel(expression: KtExpressionWithLabel) {
super.visitExpressionWithLabel(expression)
if (expression !is KtThisExpression || isNotReferencingOuterClass(expression)) {
expression.getLabelName()?.let { labelName ->
if (ignoredLabels.none { labelName.contains(it, ignoreCase = true) }) {
report(CodeSmell(issue, Entity.from(expression), issue.description))
}
val label = expression.getTargetLabel()
val labelName = label?.getReferencedName()
if (labelName != null && ignoredLabels.none { labelName.contains(it, ignoreCase = true) }) {
report(CodeSmell(issue, Entity.from(label), issue.description))
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...ity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/LabeledExpressionSpec.kt
View file
Open in desktop
@@ -1,8 +1,8 @@
package io.gitlab.arturbosch.detekt.rules.complexity

import io.gitlab.arturbosch.detekt.test.TestConfig
import io.gitlab.arturbosch.detekt.test.assertThat
import io.gitlab.arturbosch.detekt.test.compileAndLint
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

class LabeledExpressionSpec {
Expand Down Expand Up @@ -34,7 +34,11 @@ class LabeledExpressionSpec {
}
}
""".trimIndent()
assertThat(subject.compileAndLint(code)).hasSize(1)

val findings = subject.compileAndLint(code)

assertThat(findings).hasSize(1)
assertThat(findings).hasStartSourceLocation(3, 28)
}

@Test
Expand Down