Merge 790066b into bb1227a

saveourtool · Nov 16, 2020 · 3adc912 · 3adc912
2 parents bb1227a + 790066b
commit 3adc912
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BlockStructureBraces.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BlockStructureBraces.kt
@@ -178,7 +178,7 @@ class BlockStructureBraces(private val configRules: List<RulesConfig>) : Rule("b
                 if (braceSpace == null || braceSpace.elementType != WHITE_SPACE) {
                     node.addChild(PsiWhiteSpaceImpl(" "), nodeBefore)
                 } else {
-                    (braceSpace as LeafPsiElement).replaceWithText(" ")
+                    braceSpace.treeParent.replaceWhiteSpaceText(braceSpace, " ")
                 }
             }
         }

diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt
@@ -70,6 +70,12 @@ fun ASTNode.isCorrect(): Boolean = this.findAllNodesWithSpecificType(TokenType.E
 fun ASTNode.getAllChildrenWithType(elementType: IElementType): List<ASTNode> =
     this.getChildren(null).filter { it.elementType == elementType }
 
+fun ASTNode.replaceWhiteSpaceText(beforeNode: ASTNode, text: String) {
+    require(beforeNode.elementType == WHITE_SPACE)
+    this.addChild(PsiWhiteSpaceImpl(text), beforeNode)
+    this.removeChild(beforeNode)
+}
+
 /**
  * obviously returns first child that match particular element type
  */

diff --git a/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt b/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt
@@ -25,3 +25,23 @@ fun mains() {
     httpClient.doRequest()
 }
 
+class Example {
+    fun foo() {
+        if (condition1) {
+            if (condition2) {
+                bar()
+            }
+        }
+
+        if (condition3) {
+            if (condition4) {
+                foo()
+            } else {
+                bar()
+            }
+        } else {
+            foo()
+        }
+    }
+}
+
diff --git a/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt b/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt
@@ -23,4 +23,20 @@ fun mains() {
                 timeout = 100
             }
     httpClient.doRequest()
-}
+}
+
+class Example {
+    fun foo() {
+        if (condition1)
+            if (condition2)
+                bar()
+
+        if (condition3)
+            if (condition4)
+                foo()
+            else
+                bar()
+        else
+            foo()
+    }
+}