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

New J2K: Correct resolve of local variables.

Browse Source
This commit is contained in:
Dimach
2018-06-13 02:46:58 +03:00
committed by Ilya Kirillov
parent 485f5c7e37
commit 97e38615f1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
+1 -3
View File
@@ -123,11 +123,9 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) {
fun PsiReferenceExpression.toJK(): JKExpression { fun PsiReferenceExpression.toJK(): JKExpression {
val impl = this as PsiReferenceExpressionImpl val impl = this as PsiReferenceExpressionImpl
if (impl.resolve() !is PsiField) {
return JKNullLiteral() // TODO !!!
}
val access = JKJavaFieldAccessExpressionImpl(symbolProvider.provideSymbol(impl) as JKFieldSymbol) val access = JKJavaFieldAccessExpressionImpl(symbolProvider.provideSymbol(impl) as JKFieldSymbol)
return when { return when {
impl.findChildByRole(ChildRole.DOT) != null && impl.findChildByRole(ChildRole.DOT) != null &&
(impl.qualifierExpression as? PsiReferenceExpression)?.resolve() !is PsiClass -> (impl.qualifierExpression as? PsiReferenceExpression)?.resolve() !is PsiClass ->