New J2K: Fixed resolve of class reference.

j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt

@@ -122,16 +122,13 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) {
         }
 
         fun PsiReferenceExpression.toJK(): JKExpression {
-            val impl = this as PsiReferenceExpressionImpl
-
-            val access = JKJavaFieldAccessExpressionImpl(symbolProvider.provideSymbol(impl) as JKFieldSymbol)
-
-            return when {
-                impl.findChildByRole(ChildRole.DOT) != null &&
-                        (impl.qualifierExpression as? PsiReferenceExpression)?.resolve() !is PsiClass ->
-                    JKQualifiedExpressionImpl((impl.qualifier as PsiExpression).toJK(), JKJavaQualifierImpl.DOT, access)
-                else -> access
+            val symbol = symbolProvider.provideSymbol(this)
+            val access = when (symbol) {
+                is JKClassSymbol -> JKClassAccessExpressionImpl(symbol)
+                is JKFieldSymbol -> JKJavaFieldAccessExpressionImpl(symbol)
+                else -> TODO()
             }
+            return qualifierExpression?.let { JKQualifiedExpressionImpl(it.toJK(), JKJavaQualifierImpl.DOT, access) } ?: access
         }
 
         fun PsiArrayInitializerExpression.toJK(): JKExpression {

j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt

@@ -266,4 +266,8 @@ class JKIfElseExpressionImpl(condition: JKExpression, thenBranch: JKExpression,
     override var condition by child(condition)
 
     override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitIfElseExpression(this, data)
+}
+
+class JKClassAccessExpressionImpl(override var identifier: JKClassSymbol) : JKClassAccessExpression, JKElementBase() {
+    override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitClassAccessExpression(this, data)
 }

j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt

@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.j2k.tree
 
+import org.jetbrains.kotlin.j2k.tree.impl.JKClassSymbol
 import org.jetbrains.kotlin.j2k.tree.impl.JKFieldSymbol
 import org.jetbrains.kotlin.j2k.tree.impl.JKMethodSymbol
 import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
@@ -122,6 +123,10 @@ interface JKFieldAccessExpression : JKExpression {
     val identifier: JKFieldSymbol
 }
 
+interface JKClassAccessExpression : JKExpression {
+    val identifier: JKClassSymbol
+}
+
 interface JKArrayAccessExpression : JKExpression {
     val expression: JKExpression
     val indexExpression: JKExpression

j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt

@@ -28,6 +28,7 @@ interface JKVisitor<out R, in D> {
     fun visitQualifiedExpression(qualifiedExpression: JKQualifiedExpression, data: D): R = visitExpression(qualifiedExpression, data)
     fun visitMethodCallExpression(methodCallExpression: JKMethodCallExpression, data: D): R = visitExpression(methodCallExpression, data)
     fun visitFieldAccessExpression(fieldAccessExpression: JKFieldAccessExpression, data: D): R = visitExpression(fieldAccessExpression, data)
+    fun visitClassAccessExpression(classAccessExpression: JKClassAccessExpression, data: D): R = visitExpression(classAccessExpression, data)
     fun visitArrayAccessExpression(arrayAccessExpression: JKArrayAccessExpression, data: D): R = visitExpression(arrayAccessExpression, data)
     fun visitParenthesizedExpression(parenthesizedExpression: JKParenthesizedExpression, data: D): R = visitExpression(parenthesizedExpression, data)
     fun visitTypeCastExpression(typeCastExpression: JKTypeCastExpression, data: D): R = visitExpression(typeCastExpression, data)

j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt

@@ -53,6 +53,8 @@ interface JKVisitorVoid : JKVisitor<Unit, Nothing?> {
     override fun visitMethodCallExpression(methodCallExpression: JKMethodCallExpression, data: Nothing?) = visitMethodCallExpression(methodCallExpression)
     fun visitFieldAccessExpression(fieldAccessExpression: JKFieldAccessExpression) = visitExpression(fieldAccessExpression, null)
     override fun visitFieldAccessExpression(fieldAccessExpression: JKFieldAccessExpression, data: Nothing?) = visitFieldAccessExpression(fieldAccessExpression)
+    fun visitClassAccessExpression(classAccessExpression: JKClassAccessExpression) = visitExpression(classAccessExpression, null)
+    override fun visitClassAccessExpression(classAccessExpression: JKClassAccessExpression, data: Nothing?) = visitClassAccessExpression(classAccessExpression)
     fun visitArrayAccessExpression(arrayAccessExpression: JKArrayAccessExpression) = visitExpression(arrayAccessExpression, null)
     override fun visitArrayAccessExpression(arrayAccessExpression: JKArrayAccessExpression, data: Nothing?) = visitArrayAccessExpression(arrayAccessExpression)
     fun visitParenthesizedExpression(parenthesizedExpression: JKParenthesizedExpression) = visitExpression(parenthesizedExpression, null)