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.

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

Bugfix. Unused_import rule should ignore all standard operator funs #880

Merged
merged 5 commits into from
May 13, 2021
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class FileStructureRule(configRules: List<RulesConfig>) : DiktatRule(
}
private val refSet: MutableSet<String> = mutableSetOf()
private var packageName = ""
private val ignoreImports = setOf("invoke", "get", "set")
private val ignoreImports = setOf("invoke", "get", "set", "getValue")

override fun logic(node: ASTNode) {
if (node.elementType == FILE) {
Expand Down Expand Up @@ -226,11 +226,9 @@ class FileStructureRule(configRules: List<RulesConfig>) : DiktatRule(
) {
// this branch corresponds to imports from the same package
deleteImport(importPath, node, ktImportDirective)
} else if (importName != null && !ignoreImports.contains(importName) && !refSet.contains(
importName
)
) {
} else if (importName != null && !ignoreImports.contains(importName) && !refSet.contains(importName) && !operatorMap.containsKey(importName)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you disable deleting imports from operatorMap?

// this import is not used anywhere
// Fixme: operatorMap imports and `getValue` should be deleted if unused
deleteImport(importPath, node, ktImportDirective)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.cqfn.diktat.util.LintTestBase

import com.pinterest.ktlint.core.LintError
import generated.WarningNames
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -394,4 +395,83 @@ class FileStructureRuleTest : LintTestBase(::FileStructureRule) {
""".trimMargin(),
)
}

@Test
@Tag(WarningNames.UNUSED_IMPORT)
fun `check by #1`() {
lintMethod(
"""
|package org.cqfn.diktat.example
|
|import com.example.get
|import com.example.invoke
|import com.example.set
|import kotlin.properties.Delegates
|
|fun main() {
| val a by Delegates.observable()
|}
""".trimMargin(),
)
}

@Test
@Tag(WarningNames.UNUSED_IMPORT)
fun `check by #2 should not trigger`() {
lintMethod(
"""
|package org.cqfn.diktat.example
|
|import com.example.get
|import com.example.invoke
|import com.example.set
|import tasks.getValue
|
|fun main() {
| val a by tasks.getting
|}
""".trimMargin(),
)
}

@Test
@Tag(WarningNames.UNUSED_IMPORT)
fun `check by #3 should trigger`() {
lintMethod(
"""
|package org.cqfn.diktat.example
|
|import Delegate
|import com.example.get
|import com.example.invoke
|import com.example.set
|
|fun main() {
| val a
|}
""".trimMargin(),
LintError(1, 1, ruleId, "${Warnings.UNUSED_IMPORT.warnText()} Delegate - unused import", true)
)
}

@Disabled
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please provide a reason

@Test
@Tag(WarningNames.UNUSED_IMPORT)
fun `check by #4 should trigger`() {
lintMethod(
"""
|package org.cqfn.diktat.example
|
|import com.example.get
|import com.example.invoke
|import com.example.set
|import tasks.getValue
|
|fun main() {
| val a
|}
""".trimMargin(),
LintError(1, 1, ruleId, "${Warnings.UNUSED_IMPORT.warnText()} tasks.getValue - unused import", true)
)
}
}