Uast: Rewrite visitor

This commit is contained in:
Yan Zhulanow
2016-03-31 16:46:32 +03:00
parent 04e8161f1d
commit 41979de71e
66 changed files with 423 additions and 356 deletions
@@ -16,14 +16,13 @@
package org.jetbrains.uast.java
import com.intellij.psi.PsiElement
import org.jetbrains.uast.LeafUElement
import org.jetbrains.uast.UElement
import org.jetbrains.uast.psi.PsiElementBacked
class JavaDumbUElement(
override val psi: PsiElement?,
override val parent: UElement
) : JavaAbstractUElement(), UElement, PsiElementBacked, LeafUElement {
) : JavaAbstractUElement(), UElement, PsiElementBacked {
override fun logString() = "JavaDumbUElement"
override fun renderString() = "<stub@$psi>"
}
@@ -30,6 +30,4 @@ class JavaUInstanceCheckExpression(
override val operationKind: UastBinaryExpressionWithTypeKind.InstanceCheck
get() = UastBinaryExpressionWithTypeKind.INSTANCE_CHECK
override fun evaluate() = null
}
@@ -24,7 +24,7 @@ class JavaULiteralExpression(
override val psi: PsiLiteralExpression,
override val parent: UElement
) : JavaAbstractUElement(), ULiteralExpression, PsiElementBacked, JavaUElementWithType {
override val asString by lz { psi.text }
override fun asString() = psi.text
override fun evaluate() = psi.value
override val value by lz { evaluate() }
@@ -22,6 +22,6 @@ import org.jetbrains.uast.psi.PsiElementBacked
class UnknownJavaExpression(
override val psi: PsiElement,
override val parent: UElement
) : UExpression, PsiElementBacked, LeafUElement {
) : UExpression, PsiElementBacked {
override fun logString() = "[!] UnknownJavaExpression ($psi)"
}
@@ -144,7 +144,6 @@ class JavaArrayInitializerUCallExpression(
get() = JavaUastCallKinds.ARRAY_INITIALIZER
override fun resolve(context: UastContext) = null
override fun evaluate() = null
}
class JavaAnnotationArrayInitializerUCallExpression(