Fixed warning FUNCTION_BOOLEAN_PREFIX on operator fun

Closes #1723
saveourtool · Oct 30, 2023 · c1e0b37 · c1e0b37
1 parent 9d30b64
commit c1e0b37
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/...t-rules/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter1/IdentifierNaming.kt b/...t-rules/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter1/IdentifierNaming.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.KtNodeTypes.REFERENCE_EXPRESSION
 import org.jetbrains.kotlin.KtNodeTypes.TYPE_PARAMETER
 import org.jetbrains.kotlin.KtNodeTypes.TYPE_REFERENCE
 import org.jetbrains.kotlin.KtNodeTypes.VALUE_PARAMETER_LIST
-import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.com.intellij.psi.tree.TokenSet
@@ -403,21 +402,15 @@ class IdentifierNaming(configRules: List<RulesConfig>) : DiktatRule(
             }
         }
 
-        // check for methods that return Boolean
-        val functionReturnType = node.findChildAfter(VALUE_PARAMETER_LIST, TYPE_REFERENCE)?.text
-
         // We don't need to ask subclasses to rename superclass methods
         if (!node.isOverridden()) {
+            // check for methods that return Boolean
             // if function has Boolean return type in 99% of cases it is much better to name it with isXXX or hasXXX prefix
             @Suppress("COLLAPSE_IF_STATEMENTS")
-            if (functionReturnType != null && functionReturnType == PrimitiveType.BOOLEAN.typeName.asString()) {
-                @Suppress("COLLAPSE_IF_STATEMENTS")
-                val isOperatorFun = node.firstChildNode?.findChildrenMatching { it.elementType == KtNodeTypes.OPERATION_REFERENCE }
 
-                if (isOperatorFun == null && allMethodPrefixes.none { functionName.text.startsWith(it) }) {
-                    // FixMe: add agressive autofix for this
-                    FUNCTION_BOOLEAN_PREFIX.warn(configRules, emitWarn, functionName.text, functionName.startOffset, functionName)
-                }
+            if (node.hasBooleanReturnType() && !node.isOperatorFun() && allMethodPrefixes.none { functionName.text.startsWith(it) }) {
+                // FixMe: add agressive autofix for this
+                FUNCTION_BOOLEAN_PREFIX.warn(configRules, emitWarn, functionName.text, functionName.startOffset, functionName)
             }
         }
 

diff --git a/diktat-rules/src/main/kotlin/com/saveourtool/diktat/ruleset/utils/AstNodeUtils.kt b/diktat-rules/src/main/kotlin/com/saveourtool/diktat/ruleset/utils/AstNodeUtils.kt
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.KtNodeTypes.PARENTHESIZED
 import org.jetbrains.kotlin.KtNodeTypes.REFERENCE_EXPRESSION
 import org.jetbrains.kotlin.KtNodeTypes.TYPE_PARAMETER_LIST
 import org.jetbrains.kotlin.KtNodeTypes.VALUE_PARAMETER_LIST
+import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement
@@ -183,6 +184,22 @@ fun ASTNode.isAnonymousFunction(): Boolean {
     return this.getIdentifierName() == null
 }
 
+/**
+ * Checks if the function has boolean return type
+ */
+fun ASTNode.hasBooleanReturnType(): Boolean {
+    val functionReturnType = this.findChildAfter(VALUE_PARAMETER_LIST, KtNodeTypes.TYPE_REFERENCE)?.text
+    return functionReturnType != null && functionReturnType == PrimitiveType.BOOLEAN.typeName.asString()
+}
+
+/**
+ * Checks if the function is an operator function
+ */
+fun ASTNode.isOperatorFun(): Boolean {
+    val modifierListNode = this.findChildByType(MODIFIER_LIST)
+    return modifierListNode?.hasChildMatching { it.elementType == KtTokens.OPERATOR_KEYWORD } ?: false
+}
+
 /**
  * Checks if the symbols in this node are at the end of line
  */