azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: apply "cascade if..." inspection (+ some others)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-06-28 15:19:20 +03:00
committed by Mikhail Glukhikh
parent 9c06739594
commit 1d2017b0fc
80 changed files with 1079 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
+10 -9
View File
@@ -286,15 +286,16 @@ internal object KotlinConverter {
is KtVariableDeclaration -> expr<UDeclarationsExpression>(build(::convertVariablesDeclaration))
is KtStringTemplateExpression -> {
if (expression.entries.isEmpty()) {
val parent = if (parentCallback == null) null else (parentCallback() ?: return null)
expr<ULiteralExpression> { KotlinStringULiteralExpression(expression, parent, "") }
}
else if (expression.entries.size == 1)
convertEntry(expression.entries[0], parentCallback, requiredType)
else {
val parent = if (parentCallback == null) null else (parentCallback() ?: return null)
expr<UExpression> { KotlinStringTemplateUPolyadicExpression(expression, parent) }
when {
expression.entries.isEmpty() -> {
val parent = if (parentCallback == null) null else (parentCallback() ?: return null)
expr<ULiteralExpression> { KotlinStringULiteralExpression(expression, parent, "") }
}
expression.entries.size == 1 -> convertEntry(expression.entries[0], parentCallback, requiredType)
else -> {
val parent = if (parentCallback == null) null else (parentCallback() ?: return null)
expr<UExpression> { KotlinStringTemplateUPolyadicExpression(expression, parent) }
}
}
}
is KtDestructuringDeclaration -> expr<UDeclarationsExpression> {