### Whats added:

* 1 new fix test * first corrected code ### Issue (#811)
saveourtool · Jun 6, 2022 · 2b0a521 · 2b0a521
1 parent 9423868
commit 2b0a521
Show file tree

Hide file tree

Showing 4 changed files with 46 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
@@ -39,6 +39,7 @@ import com.pinterest.ktlint.core.ast.ElementType.SAFE_ACCESS_EXPRESSION
 import com.pinterest.ktlint.core.ast.ElementType.SHORT_STRING_TEMPLATE_ENTRY
 import com.pinterest.ktlint.core.ast.ElementType.STRING_TEMPLATE
 import com.pinterest.ktlint.core.ast.ElementType.THEN
+import com.pinterest.ktlint.core.ast.ElementType.VALUE_ARGUMENT
 import com.pinterest.ktlint.core.ast.ElementType.WHITE_SPACE
 import com.pinterest.ktlint.core.ast.visit
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
@@ -217,11 +218,15 @@ class IndentationRule(configRules: List<RulesConfig>) : DiktatRule(
         actualIndent: Int
     ) {
         val nextNode = whiteSpace.node.treeNext
-        if (nextNode != null &&
-                nextNode.elementType == DOT_QUALIFIED_EXPRESSION &&
-                nextNode.firstChildNode.elementType == STRING_TEMPLATE &&
-                nextNode.firstChildNode.text.startsWith("\"\"\"") &&
-                nextNode.findChildByType(CALL_EXPRESSION)?.text?.let {
+        val nextNodeDot = if (nextNode.elementType == DOT_QUALIFIED_EXPRESSION) {
+            nextNode
+        } else {
+            nextNode.getFirstChildWithType(DOT_QUALIFIED_EXPRESSION)
+        }
+        if (nextNodeDot != null &&
+                nextNodeDot.firstChildNode.elementType == STRING_TEMPLATE &&
+                nextNodeDot.firstChildNode.text.startsWith("\"\"\"") &&
+                nextNodeDot.findChildByType(CALL_EXPRESSION)?.text?.let {
                     it == "trimIndent()" ||
                             it == "trimMargin()"
                 } == true) {

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
@@ -45,4 +45,10 @@ class IndentationRuleFixTest : FixTestBase("test/paragraph3/indentation",
     fun `regression - incorrect fixing in constructor parameter list`() {
         fixAndCompare("ConstructorExpected.kt", "ConstructorTest.kt")
     }
+
+    @Test
+    @Tag(WarningNames.WRONG_INDENTATION)
+    fun `multiline string`() {
+        fixAndCompare("MultilionStringTest.kt", "MultilionStringTest.kt")
+    }
 }
diff --git a/diktat-rules/src/test/resources/test/paragraph3/indentation/MultilionStringExpected.kt b/diktat-rules/src/test/resources/test/paragraph3/indentation/MultilionStringExpected.kt
@@ -0,0 +1,15 @@
+package test.paragraph3.indentation
+
+fun checkScript() {
+    lintMethod(
+        """
+            |val q = 1
+            |
+        """.trimMargin(),
+        fileName = "src/main/kotlin/org/cqfn/diktat/Example.kts"
+    )
+}
+
+fun lintMethod(trimMargin: String, fileName: String) {
+    TODO("Not yet implemented")
+}
diff --git a/diktat-rules/src/test/resources/test/paragraph3/indentation/MultilionStringTest.kt b/diktat-rules/src/test/resources/test/paragraph3/indentation/MultilionStringTest.kt
@@ -0,0 +1,15 @@
+package test.paragraph3.indentation
+
+fun checkScript() {
+    lintMethod(
+        """
+                |val q = 1
+                |
+            """.trimMargin(),
+        fileName = "src/main/kotlin/org/cqfn/diktat/Example.kts"
+    )
+}
+
+fun lintMethod(trimMargin: String, fileName: String) {
+    TODO("Not yet implemented")
+}