From d7d9771b3c4452beb263327d5b58b86bd0d9e3a4 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 17 Apr 2019 17:53:59 +0700 Subject: [PATCH] Replace UastEmptyExpression with UastEmptyExpression(null) --- .../org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt | 8 ++++---- .../jetbrains/uast/kotlin/declarations/KotlinUVariable.kt | 4 ++-- .../jetbrains/uast/kotlin/expressions/ElvisExpression.kt | 4 ++-- .../uast/kotlin/expressions/KotlinUBlockExpression.kt | 2 +- .../uast/kotlin/expressions/KotlinUNamedExpression.kt | 2 +- .../uast/kotlin/expressions/KotlinUSwitchExpression.kt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt index 30d5faa8613..464fcce1157 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt @@ -236,7 +236,7 @@ internal object KotlinConverter { } } is KtLiteralStringTemplateEntry, is KtEscapeStringTemplateEntry -> el(build(::KotlinStringULiteralExpression)) - is KtStringTemplateEntry -> element.expression?.let { convertExpression(it, givenParent, expectedTypes) } ?: expr { UastEmptyExpression } + is KtStringTemplateEntry -> element.expression?.let { convertExpression(it, givenParent, expectedTypes) } ?: expr { UastEmptyExpression(null) } is KtWhenEntry -> el(build(::KotlinUSwitchEntry)) is KtWhenCondition -> convertWhenCondition(element, givenParent, expectedTypes) is KtTypeReference -> el { LazyKotlinUTypeReferenceExpression(element, givenParent) } @@ -381,7 +381,7 @@ internal object KotlinConverter { KotlinUDeclarationsExpression(givenParent).apply { declarations = listOf(KotlinUClass.create(lightClass, this)) } - } ?: UastEmptyExpression + } ?: UastEmptyExpression(null) } is KtFunction -> if (expression.name.isNullOrEmpty()) { expr(build(::createLocalFunctionLambdaExpression)) @@ -427,7 +427,7 @@ internal object KotlinConverter { is KtWhenConditionWithExpression -> condition.expression?.let { KotlinConverter.convertExpression(it, givenParent, requiredType) } - else -> expr { UastEmptyExpression } + else -> expr { UastEmptyExpression(null) } } } } @@ -614,7 +614,7 @@ internal object KotlinConverter { internal fun convertOrEmpty(expression: KtExpression?, parent: UElement?): UExpression { - return expression?.let { convertExpression(it, parent, DEFAULT_EXPRESSION_TYPES_LIST) } ?: UastEmptyExpression + return expression?.let { convertExpression(it, parent, DEFAULT_EXPRESSION_TYPES_LIST) } ?: UastEmptyExpression(null) } internal fun convertOrNull(expression: KtExpression?, parent: UElement?): UExpression? { diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt index b30638861f6..70012081bcd 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt @@ -59,7 +59,7 @@ abstract class AbstractKotlinUVariable(givenParent: UElement?) : KotlinAbstractU } else -> null } ?: return null - return getLanguagePlugin().convertElement(initializerExpression, this) as? UExpression ?: UastEmptyExpression + return getLanguagePlugin().convertElement(initializerExpression, this) as? UExpression ?: UastEmptyExpression(null) } val delegateExpression: UExpression? by lz { @@ -149,7 +149,7 @@ abstract class AbstractKotlinUVariable(givenParent: UElement?) : KotlinAbstractU } -private fun toUExpression(psi: PsiElement?): UExpression = psi.toUElementOfType() ?: UastEmptyExpression +private fun toUExpression(psi: PsiElement?): UExpression = psi.toUElementOfType() ?: UastEmptyExpression(null) class KotlinUVariable( psi: PsiVariable, diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/ElvisExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/ElvisExpression.kt index 2ced5a28b57..177ccad2c1a 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/ElvisExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/ElvisExpression.kt @@ -78,8 +78,8 @@ private fun createElvisExpressions( } fun createElvisExpression(elvisExpression: KtBinaryExpression, givenParent: UElement?): UExpression { - val left = elvisExpression.left ?: return UastEmptyExpression - val right = elvisExpression.right ?: return UastEmptyExpression + val left = elvisExpression.left ?: return UastEmptyExpression(null) + val right = elvisExpression.right ?: return UastEmptyExpression(null) return KotlinUElvisExpression(elvisExpression, left, right, givenParent) } diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt index ad1f79613ae..24f42e65a61 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt @@ -42,7 +42,7 @@ class KotlinUBlockExpression( fun create(initializers: List, uastParent: UElement): UBlockExpression { val languagePlugin = uastParent.getLanguagePlugin() return KotlinLazyUBlockExpression(uastParent) { expressionParent -> - initializers.map { languagePlugin.convertOpt(it.body, expressionParent) ?: UastEmptyExpression } + initializers.map { languagePlugin.convertOpt(it.body, expressionParent) ?: UastEmptyExpression(null) } } } } diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt index bf958b3de0a..541f06841b9 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt @@ -68,7 +68,7 @@ class KotlinUVarargExpression( valueArgs.map { it.getArgumentExpression()?.let { argumentExpression -> getLanguagePlugin().convert(argumentExpression, this) - } ?: UastEmptyExpression + } ?: UastEmptyExpression(null) } } diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSwitchExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSwitchExpression.kt index 99a7fe36f64..21c3c8e3f9a 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSwitchExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSwitchExpression.kt @@ -54,7 +54,7 @@ class KotlinUSwitchEntry( givenParent: UElement? ) : KotlinAbstractUExpression(givenParent), USwitchClauseExpressionWithBody { override val caseValues by lz { - psi.conditions.map { KotlinConverter.convertWhenCondition(it, this, DEFAULT_EXPRESSION_TYPES_LIST) ?: UastEmptyExpression } + psi.conditions.map { KotlinConverter.convertWhenCondition(it, this, DEFAULT_EXPRESSION_TYPES_LIST) ?: UastEmptyExpression(null) } } override val body: UExpressionList by lz {