bugfix/indentation-inside-string-templates(#758)

### What's done: * Fixed bug
saveourtool · Feb 16, 2021 · c92c850 · c92c850
1 parent e120aa4
commit c92c850
Show file tree

Hide file tree

Showing 3 changed files with 5 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
@@ -182,7 +182,7 @@ class IndentationRule(configRules: List<RulesConfig>) : DiktatRule("indentation"
         }
 
         val expectedIndent = checkResult?.expectedIndent ?: indentError.expected
-        if (checkResult?.adjustNext == true && !astNode.hasParent(LONG_STRING_TEMPLATE_ENTRY)) {
+        if (checkResult?.adjustNext == true && astNode.parents().none { it.elementType == LONG_STRING_TEMPLATE_ENTRY }) {
             val exceptionInitiatorNode = astNode.getExceptionalIndentInitiator()
             context.addException(exceptionInitiatorNode, expectedIndent - indentError.expected, checkResult.includeLastChild)
         }

diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt
@@ -39,7 +39,6 @@ import com.pinterest.ktlint.core.ast.ElementType.VALUE_PARAMETER_LIST
 import com.pinterest.ktlint.core.ast.ElementType.WHITE_SPACE
 import com.pinterest.ktlint.core.ast.nextCodeSibling
 import com.pinterest.ktlint.core.ast.prevSibling
-import org.cqfn.diktat.ruleset.utils.hasParameters
 import org.cqfn.diktat.ruleset.utils.hasParent
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement
@@ -205,10 +204,10 @@ internal class DotCallChecker(config: IndentationConfig) : CustomIndentationChec
     override fun checkNode(whiteSpace: PsiWhiteSpace, indentError: IndentationError): CheckResult? {
         whiteSpace.nextSibling.node
             .takeIf { nextNode ->
-                nextNode.isDotBeforeCallOrReference() ||
+                (nextNode.isDotBeforeCallOrReference() ||
                         nextNode.elementType == OPERATION_REFERENCE && nextNode.firstChildNode.elementType.let {
                             it == ELVIS || it == IS_EXPRESSION || it == AS_KEYWORD || it == AS_SAFE
-                        } || nextNode.isCommentBeforeDot()
+                        } || nextNode.isCommentBeforeDot()) && whiteSpace.parents.none { it.node.elementType == LONG_STRING_TEMPLATE_ENTRY }
             }
             ?.let {
                 if (it.isFromStringTemplate()) {

diff --git a/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt b/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt
@@ -626,7 +626,8 @@ class IndentationRuleWarnTest : LintTestBase(::IndentationRule) {
             """.trimMargin(),
                 LintError(4, 1, ruleId, warnText(12, 8), true),
                 LintError(5, 1, ruleId, warnText(16, 12), true),
-                LintError(6, 1, ruleId, warnText(16, 12), true)
+                LintError(6, 1, ruleId, warnText(16, 12), true),
+                rulesConfigList = rulesConfigList
         )
     }