KotlinParseException on string concatenation for if expression

### What's done: * fixed if expression in rule closes #1076, #1141
saveourtool · Jan 26, 2022 · 889be47 · 889be47
1 parent 3de4c44
commit 889be47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/...t-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/StringConcatenationRule.kt b/...t-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/StringConcatenationRule.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtConstantExpression
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
+import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.kotlin.psi.KtOperationExpression
 import org.jetbrains.kotlin.psi.KtParenthesizedExpression
 import org.jetbrains.kotlin.psi.KtReferenceExpression
@@ -155,7 +156,8 @@ class StringConcatenationRule(configRules: List<RulesConfig>) : DiktatRule(
             val rvalueTextNew = rvalueText?.trim('"')
             return "$lvalueText$rvalueTextNew"
         } else if (binaryExpressionPsi.isRvalueCallExpression() || binaryExpressionPsi.isRvalueDotQualifiedExpression() ||
-                binaryExpressionPsi.isRvalueOperation() || binaryExpressionPsi.isRvalueSafeQualifiedExpression()) {
+                binaryExpressionPsi.isRvalueOperation() || binaryExpressionPsi.isRvalueSafeQualifiedExpression() ||
+                binaryExpressionPsi.isRvalueIfExpression()) {
             // ===========  "a " + foo() -> "a ${foo()}}"
             return "$lvalueText\${$rvalueText}"
         } else if (binaryExpressionPsi.isRvalueReferenceExpression()) {
@@ -221,4 +223,7 @@ class StringConcatenationRule(configRules: List<RulesConfig>) : DiktatRule(
 
     private fun KtBinaryExpression.isRvalueSafeQualifiedExpression() =
             this.right is KtSafeQualifiedExpression
+
+    private fun KtBinaryExpression.isRvalueIfExpression() =
+        this.right is KtIfExpression
 }
diff --git a/...es/src/test/resources/test/paragraph3/string_concatenation/StringConcatenationExpected.kt b/...es/src/test/resources/test/paragraph3/string_concatenation/StringConcatenationExpected.kt
@@ -32,4 +32,5 @@ val myTest21 = "${x} string"
 val myTest22 = "string${foo()}"
 val myTest23 = x.toString() + foo()
 val myTest24 = foo() + "string"
-val myTest25 = "String ${valueStr?.value}"
+val myTest25 = "String ${valueStr?.value}"
+val myTest26 = "my string ${if (true) "1" else "2"}"
diff --git a/...-rules/src/test/resources/test/paragraph3/string_concatenation/StringConcatenationTest.kt b/...-rules/src/test/resources/test/paragraph3/string_concatenation/StringConcatenationTest.kt
@@ -33,3 +33,4 @@ val myTest22 = "string" + foo()
 val myTest23 = x.toString() + foo()
 val myTest24 = foo() + "string"
 val myTest25 = "String " + valueStr?.value
+val myTest26 = "my string " + if (true) "1" else "2"