Fixed IndentationRule

### What's done: - Fixed bug related to string templates starting with new line. It's part of #1737
saveourtool · Oct 5, 2023 · 242b6f2 · 242b6f2
1 parent 2c10a00
commit 242b6f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...es/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter3/files/IndentationRule.kt b/...es/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter3/files/IndentationRule.kt
@@ -226,8 +226,8 @@ class IndentationRule(configRules: List<RulesConfig>) : DiktatRule(
             addException(exceptionInitiatorNode, expectedIndent - indentError.expected, checkResult.includeLastChild)
         }
 
-        if (astNode.treeParent.elementType == LONG_STRING_TEMPLATE_ENTRY && indentError.expected != indentError.actual) {
-            addException(astNode.treeParent, abs(indentError.expected - indentError.actual), false)
+        if (astNode.treeParent.elementType == LONG_STRING_TEMPLATE_ENTRY && astNode.treeNext.elementType != LONG_TEMPLATE_ENTRY_END) {
+            addException(astNode.treeParent, SINGLE.level() * configuration.indentationSize, false)
         }
 
         val alignedOpeningAndClosingQuotes = hasAlignedOpeningAndClosingQuotes(astNode, indentError.actual)

diff --git a/.../src/test/kotlin/com/saveourtool/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt b/.../src/test/kotlin/com/saveourtool/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt
@@ -18,7 +18,6 @@ import com.saveourtool.diktat.util.FixTestBase
 import generated.WarningNames
 import org.assertj.core.api.Assertions.assertThat
 import org.intellij.lang.annotations.Language
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
@@ -57,7 +56,6 @@ class IndentationRuleFixTest : FixTestBase("test/paragraph3/indentation",
         fixAndCompare("IndentationParametersExpected.kt", "IndentationParametersTest.kt")
     }
 
-    @Disabled("https://github.com/saveourtool/diktat/issues/1737")
     @Test
     @Tag(WarningNames.WRONG_INDENTATION)
     fun `indentation rule - example 1`() {