feature/more-prefixes-boolean-methods(#417)

### What's done: * Fixed bugs
saveourtool · Dec 31, 2020 · 5ea54c7 · 5ea54c7
1 parent 09ffef9
commit 5ea54c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/IdentifierNaming.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/IdentifierNaming.kt
@@ -82,22 +82,20 @@ import org.jetbrains.kotlin.psi.psiUtil.parents
  */
 @Suppress("ForbiddenComment")
 class IdentifierNaming(private val configRules: List<RulesConfig>) : Rule("identifier-naming") {
-    private var isFixMode: Boolean = false
-    private lateinit var emitWarn: EmitType
-
-    val configuration by lazy {
-        BooleanFunctionsConfiguration(
-                this.configRules.getRuleConfig(FUNCTION_BOOLEAN_PREFIX)?.configuration ?: emptyMap()
-        )
-    }
-
     private val allMethodPrefixes by lazy {
         if (configuration.allowedBooleanPrefixes.isNullOrEmpty()) {
             booleanMethodPrefixes
         } else {
             booleanMethodPrefixes + configuration.allowedBooleanPrefixes.filter { it.isNotEmpty() }
         }
     }
+    private var isFixMode: Boolean = false
+    private lateinit var emitWarn: EmitType
+    val configuration by lazy {
+        BooleanFunctionsConfiguration(
+            this.configRules.getRuleConfig(FUNCTION_BOOLEAN_PREFIX)?.configuration ?: emptyMap()
+        )
+    }
 
     override fun visit(
         node: ASTNode,

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt
@@ -26,10 +26,9 @@ import org.junit.jupiter.api.Test
 
 class IdentifierNamingWarnTest : LintTestBase(::IdentifierNaming) {
     private val ruleId: String = "$DIKTAT_RULE_SET_ID:identifier-naming"
-
     private val rulesConfigBooleanFunctions: List<RulesConfig> = listOf(
-            RulesConfig(FUNCTION_BOOLEAN_PREFIX.name, true,
-                    mapOf("allowedPrefixes" to "equals, equivalent, foo"))
+        RulesConfig(FUNCTION_BOOLEAN_PREFIX.name, true,
+            mapOf("allowedPrefixes" to "equals, equivalent, foo"))
     )
     // ======== checks for generics ========
     @Test
@@ -419,7 +418,7 @@ class IdentifierNamingWarnTest : LintTestBase(::IdentifierNaming) {
                     fun fooBar(): Boolean { }
                     fun equivalentToAnother(): Boolean { }
                 """.trimIndent(),
-                rulesConfigList = rulesConfigBooleanFunctions
+            rulesConfigList = rulesConfigBooleanFunctions
         )
     }