From f9813af3ff9625aac5b095becad8a761132cf6bb Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Mon, 25 Feb 2019 17:26:54 +0300 Subject: [PATCH] 191: Uast: `KotlinUSimpleReferenceExpression` bunch fix --- .../expressions/KotlinUSimpleReferenceExpression.kt.191 | 4 ++++ plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 | 1 + 2 files changed, 5 insertions(+) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191 index 9c20366d663..1f7b3003b55 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191 +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt.191 @@ -30,9 +30,11 @@ import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor import org.jetbrains.kotlin.utils.addToStdlib.constant import org.jetbrains.uast.* +import org.jetbrains.uast.internal.log import org.jetbrains.uast.kotlin.declarations.KotlinUIdentifier import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve import org.jetbrains.uast.visitor.UastVisitor @@ -220,6 +222,8 @@ class KotlinClassViaConstructorUSimpleReferenceExpression( } override fun resolve(): PsiElement? = resolved + + override fun asLogString(): String = log("identifier = $identifier, resolvesTo = $resolvedName") } class KotlinStringUSimpleReferenceExpression( diff --git a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 index 86e143ff559..b9dc2a90c68 100644 --- a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 +++ b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 @@ -1,6 +1,7 @@ package org.jetbrains.uast.test.kotlin import com.intellij.psi.PsiAnnotation +import com.intellij.psi.PsiClass import com.intellij.psi.PsiModifier import com.intellij.testFramework.RunAll import com.intellij.testFramework.UsefulTestCase