From 97e38615f1f0a194149e561450d7b73230ec8002 Mon Sep 17 00:00:00 2001 From: Dimach Date: Wed, 13 Jun 2018 02:46:58 +0300 Subject: [PATCH] New J2K: Correct resolve of local variables. --- j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt index a6240471376..3c98dc548ed 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt @@ -123,11 +123,9 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) { fun PsiReferenceExpression.toJK(): JKExpression { val impl = this as PsiReferenceExpressionImpl - if (impl.resolve() !is PsiField) { - return JKNullLiteral() // TODO !!! - } val access = JKJavaFieldAccessExpressionImpl(symbolProvider.provideSymbol(impl) as JKFieldSymbol) + return when { impl.findChildByRole(ChildRole.DOT) != null && (impl.qualifierExpression as? PsiReferenceExpression)?.resolve() !is PsiClass ->