### Whats Added:

* corrected code StringLiteral * added test ### Issue(#811)
saveourtool · Jun 6, 2022 · 32c646c · 32c646c
1 parent 2b0a521
commit 32c646c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/IndentationRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/IndentationRule.kt
@@ -231,6 +231,7 @@ class IndentationRule(configRules: List<RulesConfig>) : DiktatRule(
                             it == "trimMargin()"
                 } == true) {
             fixStringLiteral(whiteSpace, expectedIndent, actualIndent)
+            println(nextNodeDot)
         }
     }
 
@@ -242,14 +243,19 @@ class IndentationRule(configRules: List<RulesConfig>) : DiktatRule(
         expectedIndent: Int,
         actualIndent: Int
     ) {
-        val textIndent = " ".repeat(expectedIndent + INDENT_SIZE)
-        val templateEntries = whiteSpace.node.treeNext.firstChildNode.getAllChildrenWithType(LITERAL_STRING_TEMPLATE_ENTRY)
-        templateEntries.forEach { node ->
+        val nextNodeDot = if (whiteSpace.node.treeNext.elementType == DOT_QUALIFIED_EXPRESSION) {
+            whiteSpace.node.treeNext
+        } else {
+            whiteSpace.node.treeNext.getFirstChildWithType(DOT_QUALIFIED_EXPRESSION)
+        }
+        val textIndent = " ".repeat(actualIndent + INDENT_SIZE)
+        val templateEntries = nextNodeDot?.getFirstChildWithType(STRING_TEMPLATE)?.getAllChildrenWithType(LITERAL_STRING_TEMPLATE_ENTRY)
+        templateEntries?.forEach { node ->
             if (!node.text.contains("\n")) {
                 fixFirstTemplateEntries(node, textIndent, actualIndent)
             }
         }
-        (templateEntries.last().firstChildNode as LeafPsiElement)
+        (templateEntries?.last()?.firstChildNode as LeafPsiElement)
             .rawReplaceWithText(" ".repeat(expectedIndent) + templateEntries
                 .last()
                 .firstChildNode

diff --git a/...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt b/...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt
@@ -49,6 +49,6 @@ class IndentationRuleFixTest : FixTestBase("test/paragraph3/indentation",
     @Test
     @Tag(WarningNames.WRONG_INDENTATION)
     fun `multiline string`() {
-        fixAndCompare("MultilionStringTest.kt", "MultilionStringTest.kt")
+        fixAndCompare("MultilionStringExpected.kt", "MultilionStringTest.kt")
     }
 }