removed usage of KtElement.replaceWithBlock

saveourtool · Sep 22, 2023 · af46f8e · af46f8e
1 parent 58afc2c
commit af46f8e
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/.../kotlin/com/saveourtool/diktat/ruleset/rules/chapter3/BracesInConditionalsAndLoopsRule.kt b/.../kotlin/com/saveourtool/diktat/ruleset/rules/chapter3/BracesInConditionalsAndLoopsRule.kt
@@ -119,7 +119,7 @@ class BracesInConditionalsAndLoopsRule(configRules: List<RulesConfig>) : DiktatR
  NO_BRACES_IN_CONDITIONALS_AND_LOOPS.warnAndFix(configRules, emitWarn, isFixMode, "ELSE",
  (elseNode?.treeParent?.prevSibling { it.elementType == ELSE_KEYWORD } ?: node).startOffset, node) {
  elseNode?.run {
- (psi as KtElement).replaceWithBlock(indent)
+ replaceWithBlock(indent)
  }
  ?: run {
  // `else` can have empty body e.g. when there is a semicolon after: `else ;`
@@ -141,7 +141,7 @@ class BracesInConditionalsAndLoopsRule(configRules: List<RulesConfig>) : DiktatR
  .lines()
  .last()
  .count { it == ' ' }
- loopBody?.run {
+ loopBodyNode?.run {
  replaceWithBlock(indent)
  }
  ?: run {
@@ -174,13 +174,6 @@ class BracesInConditionalsAndLoopsRule(configRules: List<RulesConfig>) : DiktatR
  }
  }
 
- private fun KtElement.replaceWithBlock(indent: Int) {
- val ktBlockNode = KtBlockExpression(
- "{\n${" ".repeat(indent + INDENT_STEP)}$text\n${" ".repeat(indent)}}"
- )
- this.astReplace(ktBlockNode)
- }
-
  private fun ASTNode.replaceWithBlock(indent: Int) {
  val blockNode = ASTFactory.composite(BLOCK)
  this.treeParent.addChild(blockNode, this)