From 0feaad2205693ae07bfc249bbd0aeea272864539 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 19 Dec 2018 16:11:22 +0300
Subject: [PATCH] New J2K: Fix enum constant symbol

---
 j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt    | 4 ++++
 j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt
index 86fffea1286..63bfa5feffa 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt
@@ -115,6 +115,10 @@ class JKSymbolProvider {
             provideUniverseSymbol(method)
         }
 
+        override fun visitEnumConstant(enumConstant: PsiEnumConstant) {
+            provideUniverseSymbol(enumConstant)
+        }
+
         override fun visitFile(file: PsiFile) {
             file.acceptChildren(this)
         }
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
index 48752edeb48..135555df52e 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
@@ -407,7 +407,10 @@ class JavaToJKTreeBuilder(var symbolProvider: JKSymbolProvider) {
                 with(expressionTreeMapper) { argumentList.toJK() },
                 initializingClass?.createClassBody() ?: JKEmptyClassBodyImpl(),
                 JKTypeElementImpl(JKClassTypeImpl(symbolProvider.provideDirectSymbol(containingClass!!) as JKClassSymbol, emptyList()))
-            )
+            ).also {
+                symbolProvider.provideUniverseSymbol(this, it)
+                it.psi = this
+            }
 
         fun PsiMember.modality() =
             when {