From 084da3665ad9b9b2883c1f35d75da14c2c71088e Mon Sep 17 00:00:00 2001
From: Nicolay Mitropolsky <Nicolay.Mitropolsky@jetbrains.com>
Date: Mon, 4 Dec 2017 16:00:15 +0300
Subject: [PATCH] Uast: removing java-uast usage from
 `KotlinUastLanguagePlugin` and `KotlinEnumConstantClassReference`

---
 .../src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt    | 3 ++-
 .../src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt  | 3 ---
 .../org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt    | 1 -
 .../org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt  | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
index 7e6d0f35f97..fb812f277a2 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
@@ -165,7 +165,8 @@ private fun findAnnotationClassFromConstructorParameter(parameter: KtParameter):
 abstract class KotlinAbstractUExpression(givenParent: UElement?)
     : KotlinAbstractUElement(givenParent), UExpression, JvmDeclarationUElement {
 
-    override val javaPsi = null
+    override val javaPsi: PsiElement? = null
+
     override val sourcePsi
         get() = psi
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
index 531f6eaff72..063b38baf0a 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.uast.*
-import org.jetbrains.uast.java.JavaUastLanguagePlugin
 import org.jetbrains.uast.kotlin.declarations.KotlinUMethod
 import org.jetbrains.uast.kotlin.expressions.*
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
@@ -52,8 +51,6 @@ var PsiElement.destructuringDeclarationInitializer: Boolean? by UserDataProperty
 class KotlinUastLanguagePlugin : UastLanguagePlugin {
     override val priority = 10
 
-    private val javaPlugin by lz { UastLanguagePlugin.getInstances().first { it is JavaUastLanguagePlugin } }
-
     override val language: Language
         get() = KotlinLanguage.INSTANCE
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
index a53b10310a7..c007c2d7fea 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.uast.*
-import org.jetbrains.uast.java.annotations
 import org.jetbrains.uast.java.internal.JavaUElementWithComments
 import org.jetbrains.uast.kotlin.*
 
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
index 7e283f487ea..9fcc8337dba 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.types.typeUtil.nullability
 import org.jetbrains.kotlin.utils.SmartList
 import org.jetbrains.uast.*
 import org.jetbrains.uast.internal.acceptList
-import org.jetbrains.uast.java.JavaAbstractUExpression
 import org.jetbrains.uast.kotlin.declarations.UastLightIdentifier
 import org.jetbrains.uast.kotlin.internal.KotlinUElementWithComments
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
@@ -406,7 +405,7 @@ open class KotlinUEnumConstant(
             override val psi: PsiEnumConstant,
             override val sourcePsi: KtElement?,
             private val givenParent: UElement?
-    ) : JavaAbstractUExpression(), USimpleNameReferenceExpression {
+    ) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression {
         override val javaPsi: PsiElement?
             get() = psi