Uast: uastParent made final in KotlinAbstractUElement

plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt

@@ -33,7 +33,7 @@ import org.jetbrains.uast.kotlin.psi.UastKotlinPsiVariable
 
 abstract class KotlinAbstractUElement(private val givenParent: UElement?) : UElement, JvmDeclarationUElement {
 
-    override val uastParent: UElement? by lz {
+    final override val uastParent: UElement? by lz {
         givenParent ?: convertParent()
     }
 

plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt

@@ -262,8 +262,8 @@ class KotlinScriptUClass(
     class KotlinScriptConstructorUMethod(
             script: KtScript,
             override val psi: KtLightMethod,
-            override val uastParent: UElement?
+            givenParent: UElement?
-    ) : KotlinUMethod(psi, uastParent) {
+    ) : KotlinUMethod(psi, givenParent) {
         override val uastBody: UExpression? by lz {
             val initializers = script.declarations.filterIsInstance<KtScriptInitializer>()
             KotlinUBlockExpression.create(initializers, this)

plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt

@@ -337,7 +337,7 @@ open class KotlinUAnnotatedLocalVariable(
     override val annotations: List<UAnnotation> by lz { computeAnnotations(this) }
 }
 
-open class KotlinUEnumConstant(
+class KotlinUEnumConstant(
         psi: PsiEnumConstant,
         override val sourcePsi: KtElement?,
         givenParent: UElement?
@@ -349,6 +349,10 @@ open class KotlinUEnumConstant(
         }
     }
 
+    override fun getInitializer(): PsiExpression? = super<AbstractKotlinUVariable>.getInitializer()
+
+    override fun getOriginalElement(): PsiElement? = super<AbstractKotlinUVariable>.getOriginalElement()
+
     override val javaPsi = unwrap<UEnumConstant, PsiEnumConstant>(psi)
 
     override val psi = javaPsi
@@ -404,15 +408,11 @@ open class KotlinUEnumConstant(
     private class KotlinEnumConstantClassReference(
             override val psi: PsiEnumConstant,
             override val sourcePsi: KtElement?,
-            private val givenParent: UElement?
+            givenParent: UElement?
     ) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression {
         override val javaPsi: PsiElement?
             get() = psi
 
-        override val uastParent: UElement? by lz {
-            givenParent ?: KotlinUastLanguagePlugin().convertElementWithParent(psi.parent ?: psi.containingFile, null)
-        }
-
         override fun resolve() = psi.containingClass
         override val resolvedName: String?
             get() = psi.containingClass?.name

plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUDeclarationsExpression.kt

@@ -28,8 +28,8 @@ open class KotlinUDeclarationsExpression(
     override val sourcePsi: PsiElement?
         get() = psiAnchor
 
-    override val uastParent: UElement?
+    override fun convertParent(): UElement? =
-        get() = if (psiAnchor != null) doConvertParent(this, psiAnchor.parent) else super.uastParent
+            psiAnchor?.let { doConvertParent(this, it.parent) } ?: super.convertParent()
 
     constructor(uastParent: UElement?) : this(null, uastParent)