azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uast: Rename JavaPsiElemenStub -> JavaDumbUElement, KotlinPsiElementStub -> KotlinDumbUElement.

Browse Source 
Use it everywhere in `nameElement`
This commit is contained in:
Yan Zhulanow
2016-03-18 21:52:36 +03:00
parent 6c40fda7b7
commit 514e3859da
13 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaParameterUTypeReference.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class JavaParameterUTypeReference(
override val name: String
get() = psi.name.orAnonymous()
override val nameElement by lz { psi.nameIdentifier?.let { JavaPsiElementStub(it, this) } }
override val nameElement by lz { psi.nameIdentifier?.let { JavaDumbUElement(it, this) } }
override fun resolve(context: UastContext) = psi.reference?.resolve()?.let { JavaConverter.convertWithParent(it) } as? UClass
}
plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaUClass.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class JavaUClass(
override val nameElement by lz {
if (psi is PsiAnonymousClass && newExpression != null) {
newExpression.classOrAnonymousClassReference?.referenceNameElement?.let { JavaPsiElementStub(it, this) }
newExpression.classOrAnonymousClassReference?.referenceNameElement?.let { JavaDumbUElement(it, this) }
} else {
JavaConverter.convert(psi.nameIdentifier, this)
}
plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaUFunction.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class JavaUFunction(
override val name: String
get() = if (psi.isConstructor) "<init>" else psi.name
override val nameElement by lz { JavaConverter.convert(psi.nameIdentifier, this) }
override val nameElement by lz { JavaDumbUElement(psi.nameIdentifier, this) }
override val valueParameters by lz { psi.parameterList.parameters.map { JavaConverter.convert(it, this) } }
plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class JavaUVariable(
override val name: String
get() = psi.name.orAnonymous()
override val nameElement by lz { JavaConverter.convert(psi.nameIdentifier, this) }
override val nameElement by lz { JavaDumbUElement(psi.nameIdentifier, this) }
override val type by lz { JavaConverter.convert(psi.type, this) }
override val initializer by lz { JavaConverter.convertOrEmpty(psi.initializer, this) }
plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaValueParameterUVariable.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class JavaValueParameterUVariable(
override val name: String
get() = psi.name.orAnonymous()
override val nameElement by lz { JavaConverter.convert(psi.nameIdentifier, this) }
override val nameElement by lz { JavaDumbUElement(psi.nameIdentifier, this) }
override val type by lz { JavaConverter.convert(psi.type, this) }
override val initializer: UExpression?
plugins/uast-java/src/org/jetbrains/uast/java/expressions/JavaPsiElementStub.kt → plugins/uast-java/src/org/jetbrains/uast/java/expressions/JavaDumbUElement.kt
+3 -3
View File
@@ -20,10 +20,10 @@ import org.jetbrains.uast.NoTraverse
import org.jetbrains.uast.UElement
import org.jetbrains.uast.psi.PsiElementBacked
class JavaPsiElementStub(
override val psi: PsiElement,
class JavaDumbUElement(
override val psi: PsiElement?,
override val parent: UElement
) : UElement, PsiElementBacked, NoTraverse {
) : JavaAbstractUElement(), UElement, PsiElementBacked, NoTraverse {
override fun logString() = "JavaPsiElementStub"
override fun renderString() = "<stub@$psi>"
}
plugins/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
+5 -5
View File
@@ -25,7 +25,7 @@ import org.jetbrains.uast.psi.PsiElementBacked
class JavaUCallExpression(
override val psi: PsiMethodCallExpression,
override val parent: UElement
) : UCallExpression, PsiElementBacked, JavaTypeHelper, NoEvaluate {
) : JavaAbstractUElement(), UCallExpression, PsiElementBacked, JavaTypeHelper, NoEvaluate {
override val kind: UastCallKind
get() = UastCallKind.FUNCTION_CALL
@@ -54,7 +54,7 @@ class JavaUCallExpression(
class JavaConstructorUCallExpression(
override val psi: PsiNewExpression,
override val parent: UElement
) : UCallExpression, PsiElementBacked, JavaTypeHelper, NoEvaluate {
) : JavaAbstractUElement(), UCallExpression, PsiElementBacked, JavaTypeHelper, NoEvaluate {
override val kind by lz {
when {
psi.arrayInitializer != null -> JavaUastCallKinds.ARRAY_INITIALIZER
@@ -110,7 +110,7 @@ class JavaConstructorUCallExpression(
else null
}
override val functionNameElement by lz { JavaPsiElementStub(psi, this) }
override val functionNameElement by lz { JavaDumbUElement(psi, this) }
override fun resolve(context: UastContext) = psi.resolveConstructor()?.let { context.convert(it) } as? UFunction
}
@@ -118,7 +118,7 @@ class JavaConstructorUCallExpression(
class JavaArrayInitializerUCallExpression(
override val psi: PsiArrayInitializerExpression,
override val parent: UElement
) : UCallExpression, PsiElementBacked, JavaTypeHelper, JavaEvaluateHelper {
) : JavaAbstractUElement(), UCallExpression, PsiElementBacked, JavaTypeHelper, JavaEvaluateHelper {
override val functionReference: USimpleReferenceExpression?
get() = null
@@ -150,7 +150,7 @@ class JavaArrayInitializerUCallExpression(
class JavaAnnotationArrayInitializerUCallExpression(
override val psi: PsiArrayInitializerMemberValue,
override val parent: UElement
) : UCallExpression, PsiElementBacked, JavaTypeHelper, JavaEvaluateHelper {
) : JavaAbstractUElement(), UCallExpression, PsiElementBacked, JavaTypeHelper, JavaEvaluateHelper {
override val kind = JavaUastCallKinds.ARRAY_INITIALIZER
override val functionReference: USimpleReferenceExpression?