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

Rule 6.4.1: Avoid using utility classes/objects #508

Merged
merged 18 commits into from
Dec 6, 2020
Merged

Rule 6.4.1: Avoid using utility classes/objects #508

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8c62ba8
Rule 6.4.1
kentr0w Nov 10, 2020
20cb1b2
Rule 6.4.1
kentr0w Nov 12, 2020
1d9cbd3
Rule 6.4.1
kentr0w Nov 13, 2020
d73d339
Merge remote-tracking branch 'origin/master' into feature/rule-6.4.1
kentr0w Nov 13, 2020
9a9034a
Rule 6.4.1
kentr0w Nov 13, 2020
ed5edb2
rule 6.1.4
kentr0w Nov 23, 2020
677b05d
Merge remote-tracking branch 'origin/master' into feature/rule-6.4.1
kentr0w Nov 23, 2020
6fc9c49
Rule 6.4.1
kentr0w Nov 24, 2020
08384a4
Merge remote-tracking branch 'origin/master' into feature/rule-6.4.1
kentr0w Nov 24, 2020
e620332
Rule 6.4.1
kentr0w Nov 25, 2020
7b9461e
Rule 6.4.1
kentr0w Nov 27, 2020
183c1a2
Merge remote-tracking branch 'origin/master' into feature/rule-6.4.1
kentr0w Dec 4, 2020
66ea1f1
Rule 6.4.1
kentr0w Dec 4, 2020
33c5e81
Rule 6.4.1
kentr0w Dec 4, 2020
32ed69b
Rule 6.4.1
kentr0w Dec 4, 2020
97fedcf
Rule 6.4.1
kentr0w Dec 4, 2020
6b1bfb7
Rule 6.4.1
kentr0w Dec 5, 2020
e2f9f58
Rule 6.4.1
kentr0w Dec 5, 2020
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
11 changes: 8 additions & 3 deletions diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidUtilityClass.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import com.pinterest.ktlint.core.ast.ElementType.PRIMARY_CONSTRUCTOR
import com.pinterest.ktlint.core.ast.ElementType.RBRACE
import com.pinterest.ktlint.core.ast.ElementType.WHITE_SPACE
import org.cqfn.diktat.common.config.rules.RulesConfig
import org.cqfn.diktat.common.config.rules.getCommonConfiguration
import org.cqfn.diktat.ruleset.constants.EmitType
import org.cqfn.diktat.ruleset.constants.Warnings.AVOID_USING_UTILITY_CLASS
import org.cqfn.diktat.ruleset.utils.hasChildOfType
import org.cqfn.diktat.ruleset.utils.*
import org.jetbrains.kotlin.com.intellij.lang.ASTNode
import org.jetbrains.kotlin.psi.psiUtil.children

Expand All @@ -36,8 +37,12 @@ class AvoidUtilityClass(private val configRules: List<RulesConfig>) : Rule("avoi
override fun visit(node: ASTNode, autoCorrect: Boolean, emit: EmitType) {
emitWarn = emit
isFixMode = autoCorrect
if (node.elementType == OBJECT_DECLARATION || node.elementType == CLASS ) {
checkClass(node)
val config = configRules.getCommonConfiguration().value
kentr0w marked this conversation as resolved.
Show resolved Hide resolved
val fileName = node.getRootNode().getFileName()
if (!(node.hasTestAnnotation() || isLocatedInTest(fileName.splitPathToDirs(), config.testAnchors))) {
kentr0w marked this conversation as resolved.
Show resolved Hide resolved
if (node.elementType == OBJECT_DECLARATION || node.elementType == CLASS) {
checkClass(node)
}
}
}

Expand Down