Merge branch 'master' into bugfix/wrong_newlines

saveourtool · Dec 12, 2023 · 82ffcbb · 82ffcbb
2 parents fc9e65d + fd85628
commit 82ffcbb
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 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
@@ -199,7 +199,7 @@ class IdentifierNaming(configRules: List<RulesConfig>) : DiktatRule(
                     }
                 } else if (variableName.text != "_" && !variableName.text.isLowerCamelCase() &&
                         // variable name should be in camel case. The only exception is a list of industry standard variables like i, j, k.
-                        !isPairPropertyBackingField(null, node)
+                        !isPairPropertyBackingField(null, node.psi as? KtProperty)
                 ) {
                     VARIABLE_NAME_INCORRECT_FORMAT.warnOnlyOrWarnAndFix(
                         configRules = configRules,

diff --git a/...s/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt b/...s/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.lexer.KtTokens.GET_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.OVERRIDE_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.PRIVATE_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.SET_KEYWORD
+import org.jetbrains.kotlin.psi.KtProperty
 
 /**
  * Inspection that checks that no custom getters and setters are used for properties.
@@ -34,7 +35,7 @@ class CustomGetterSetterRule(configRules: List<RulesConfig>) : DiktatRule(
         val isOverrideGetter = node.treeParent.getFirstChildWithType(MODIFIER_LIST)?.hasAnyChildOfTypes(OVERRIDE_KEYWORD) ?: false
 
         // find matching node
-        if (isPairPropertyBackingField(node.treeParent, null)) {
+        if (isPairPropertyBackingField(node.treeParent?.psi as? KtProperty, null)) {
             return
         }
 

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.PROPERTY
 import org.jetbrains.kotlin.KtNodeTypes.REFERENCE_EXPRESSION
 import org.jetbrains.kotlin.KtNodeTypes.TYPE_PARAMETER_LIST
+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
@@ -45,6 +46,8 @@ import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.PsiWhiteSpaceImpl
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.com.intellij.psi.tree.TokenSet
+import org.jetbrains.kotlin.js.translate.declaration.hasCustomGetter
+import org.jetbrains.kotlin.js.translate.declaration.hasCustomSetter
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens.KDOC
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.lexer.KtTokens.ANDAND
@@ -69,8 +72,15 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtIfExpression
+import org.jetbrains.kotlin.psi.KtNullableType
 import org.jetbrains.kotlin.psi.KtParameterList
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.psi.KtTypeReference
+import org.jetbrains.kotlin.psi.KtUserType
 import org.jetbrains.kotlin.psi.psiUtil.children
+import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
+import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
+import org.jetbrains.kotlin.psi.psiUtil.isPrivate
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.psi.psiUtil.siblings
 import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType
@@ -1186,28 +1196,33 @@ fun doesLambdaContainIt(lambdaNode: ASTNode): Boolean {
  * @return true if node has a pair
  */
 @Suppress("CyclomaticComplexMethod")
-internal fun isPairPropertyBackingField(propertyNode: ASTNode?, backingFieldNode: ASTNode?): Boolean {
-    val node = propertyNode ?: backingFieldNode
-    val propertyListNullable = (node?.treeParent?.getAllChildrenWithType(PROPERTY)) ?: return false
-    val propertyList: List<ASTNode> = propertyListNullable
-    val nodeType = node.getFirstChildWithType(KtNodeTypes.TYPE_REFERENCE)
-    val nodeNullableType = nodeType?.getFirstChildWithType(KtNodeTypes.NULLABLE_TYPE)
-    val nodeName = node.getFirstChildWithType(IDENTIFIER)?.text
+internal fun isPairPropertyBackingField(propertyNode: KtProperty?, backingFieldNode: KtProperty?): Boolean {
+    val node = (propertyNode ?: backingFieldNode)
+    val propertyList = (node?.parent?.getChildrenOfType<KtProperty>()) ?: return false
+    val nodeType: KtTypeReference? = node.getChildOfType<KtTypeReference>()
+    val nodeNullableType = nodeType?.getChildOfType<KtNullableType>()
+    val nodeName = node.name
 
     val matchingNode = propertyList.find {pairNode ->
-        val propertyType = pairNode.getFirstChildWithType(KtNodeTypes.TYPE_REFERENCE)
+        val propertyType: KtTypeReference? = pairNode.getChildOfType<KtTypeReference>()
         // check that property and backing field has same type
         val sameType = nodeType?.text == propertyType?.text
+
         // check that property USER_TYPE is same as backing field NULLABLE_TYPE
-        val sameTypeWithNullable = propertyType?.getFirstChildWithType(KtNodeTypes.USER_TYPE)?.text ==
-                nodeNullableType?.getFirstChildWithType(KtNodeTypes.USER_TYPE)?.text
+        val sameTypeWithNullable = propertyType?.getChildOfType<KtUserType>()?.text ==
+                nodeNullableType?.getChildOfType<KtUserType>()?.text
+
         // check matching names
-        val propertyName = pairNode.getFirstChildWithType(IDENTIFIER)?.text
+        val propertyName = pairNode.name
         val matchingNames = propertyNode?.let { nodeName == propertyName?.drop(1) } ?: run { nodeName?.drop(1) == propertyName }
 
         val isPrivate = propertyNode?.let { pairNode.isPrivate() } ?: run { node.isPrivate() }
-        val noSetterGetterBackingField = propertyNode?.let { !pairNode.hasSetterOrGetter() } ?: run { !node.hasSetterOrGetter() }
-        val hasSetterOrGetterProperty = propertyNode?.let { node.hasSetterOrGetter() } ?: run { pairNode.hasSetterOrGetter() }
+        val noSetterGetterBackingField = propertyNode?.let { !(pairNode.hasCustomSetter() || pairNode.hasCustomGetter()) } ?: run {
+            !(node.hasCustomSetter() || node.hasCustomGetter())
+        }
+        val hasSetterOrGetterProperty = propertyNode?.let { node.hasCustomSetter() || node.hasCustomGetter() } ?: run {
+            pairNode.hasCustomSetter() || pairNode.hasCustomGetter()
+        }
 
         matchingNames && (sameType || sameTypeWithNullable) && isPrivate &&
                 noSetterGetterBackingField && hasSetterOrGetterProperty