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

Uast: don't fall on empty when entries (EA-231339)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2020-04-27 17:35:05 +03:00
parent 3143b15a17
commit 903f35ce0c
6 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSwitchExpression.kt
+18 -15
View File
@@ -72,21 +72,24 @@ class KotlinUSwitchEntry(
is KtBlockExpression -> exprPsi.statements.map { KotlinConverter.convertOrEmpty(it, this) }
else -> listOf(KotlinConverter.convertOrEmpty(exprPsi, this))
}
expressions = userExpressions.subList(0, userExpressions.lastIndex) + object : UYieldExpression, JvmDeclarationUElementPlaceholder {
override val javaPsi: PsiElement? = null
override val sourcePsi: PsiElement? = null
override val psi: PsiElement?
get() = null
override val label: String?
get() = null
override val uastParent: UElement?
get() = this@KotlinUExpressionList
override val annotations: List<UAnnotation>
get() = emptyList()
override val expression: UExpression?
get() = userExpressions.lastOrNull()?.sourcePsi.safeAs<KtExpression>()
?.let { KotlinConverter.convertExpression(it, this, DEFAULT_EXPRESSION_TYPES_LIST) }
}
expressions =
if (userExpressions.isNotEmpty())
userExpressions.subList(0, userExpressions.lastIndex) + object : UYieldExpression, JvmDeclarationUElementPlaceholder {
override val javaPsi: PsiElement? = null
override val sourcePsi: PsiElement? = null
override val psi: PsiElement?
get() = null
override val label: String?
get() = null
override val uastParent: UElement?
get() = this@KotlinUExpressionList
override val annotations: List<UAnnotation>
get() = emptyList()
override val expression: UExpression?
get() = userExpressions.lastOrNull()?.sourcePsi.safeAs<KtExpression>()
?.let { KotlinConverter.convertExpression(it, this, DEFAULT_EXPRESSION_TYPES_LIST) }
}
else emptyList()
}
}
plugins/uast-kotlin/testData/WhenAndDestructing.kt
Vendored
+2
View File
@@ -7,6 +7,8 @@ fun getElementsAdditionalResolve(string: String): String {
return "bindingContext"
}
"empty-switch" -> {}
else -> {
val (bindingContext, statementFilter) = arr
return bindingContext
plugins/uast-kotlin/testData/WhenAndDestructing.log.txt
Vendored
+7 -3
View File
@@ -24,23 +24,27 @@ UFile (package = )
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bindingContext")
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "empty-switch")
UExpressionList (when_entry)
USwitchClauseExpressionWithBody
UExpressionList (when_entry)
UDeclarationsExpression
ULocalVariable (name = var837f1e82)
ULocalVariable (name = var837f2350)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = arr)
ULocalVariable (name = bindingContext)
UAnnotation (fqName = null)
UQualifiedReferenceExpression
USimpleNameReferenceExpression (identifier = var837f1e82)
USimpleNameReferenceExpression (identifier = var837f2350)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (component1))
USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
ULocalVariable (name = statementFilter)
UAnnotation (fqName = null)
UQualifiedReferenceExpression
USimpleNameReferenceExpression (identifier = var837f1e82)
USimpleNameReferenceExpression (identifier = var837f2350)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (component2))
USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.192
Vendored
+8 -3
View File
@@ -24,23 +24,28 @@ UFile (package = )
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bindingContext")
UBreakExpression (label = null)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "empty-switch")
UExpressionList (when_entry)
UBreakExpression (label = null)
USwitchClauseExpressionWithBody
UExpressionList (when_entry)
UDeclarationsExpression
ULocalVariable (name = var837f1e82)
ULocalVariable (name = var837f2350)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = arr)
ULocalVariable (name = bindingContext)
UAnnotation (fqName = null)
UQualifiedReferenceExpression
USimpleNameReferenceExpression (identifier = var837f1e82)
USimpleNameReferenceExpression (identifier = var837f2350)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (component1))
USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
ULocalVariable (name = statementFilter)
UAnnotation (fqName = null)
UQualifiedReferenceExpression
USimpleNameReferenceExpression (identifier = var837f1e82)
USimpleNameReferenceExpression (identifier = var837f2350)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (component2))
USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
plugins/uast-kotlin/testData/WhenAndDestructing.render.txt
Vendored
+6 -3
View File
@@ -6,10 +6,13 @@ public final class WhenAndDestructingKt {
yield return "bindingContext"
}
"empty-switch" -> {
}
-> {
@null var var837f1e82: <ErrorType> = arr
@null var bindingContext: java.lang.String = var837f1e82.<anonymous class>()
@null var statementFilter: java.lang.String = var837f1e82.<anonymous class>()
@null var var837f2350: <ErrorType> = arr
@null var bindingContext: java.lang.String = var837f2350.<anonymous class>()
@null var statementFilter: java.lang.String = var837f2350.<anonymous class>()
yield return bindingContext
}
plugins/uast-kotlin/testData/WhenAndDestructing.render.txt.192
Vendored
+7 -3
View File
@@ -7,10 +7,14 @@ public final class WhenAndDestructingKt {
break
}
"empty-switch" -> {
break
}
-> {
@null var var837f1e82: <ErrorType> = arr
@null var bindingContext: java.lang.String = var837f1e82.<anonymous class>()
@null var statementFilter: java.lang.String = var837f1e82.<anonymous class>()
@null var var837f2350: <ErrorType> = arr
@null var bindingContext: java.lang.String = var837f2350.<anonymous class>()
@null var statementFilter: java.lang.String = var837f2350.<anonymous class>()
return bindingContext
break
}