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

Uast: removing java-uast usage from KotlinUastLanguagePlugin and KotlinEnumConstantClassReference

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-12-04 16:00:15 +03:00
committed by Nikolay Krasko
parent 260c549cd7
commit 084da3665a
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
+2 -1
View File
@@ -165,7 +165,8 @@ private fun findAnnotationClassFromConstructorParameter(parameter: KtParameter):
abstract class KotlinAbstractUExpression(givenParent: UElement?) abstract class KotlinAbstractUExpression(givenParent: UElement?)
: KotlinAbstractUElement(givenParent), UExpression, JvmDeclarationUElement { : KotlinAbstractUElement(givenParent), UExpression, JvmDeclarationUElement {
override val javaPsi = null override val javaPsi: PsiElement? = null
override val sourcePsi override val sourcePsi
get() = psi get() = psi
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
-3
View File
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.uast.* import org.jetbrains.uast.*
import org.jetbrains.uast.java.JavaUastLanguagePlugin
import org.jetbrains.uast.kotlin.declarations.KotlinUMethod import org.jetbrains.uast.kotlin.declarations.KotlinUMethod
import org.jetbrains.uast.kotlin.expressions.* import org.jetbrains.uast.kotlin.expressions.*
import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
@@ -52,8 +51,6 @@ var PsiElement.destructuringDeclarationInitializer: Boolean? by UserDataProperty
class KotlinUastLanguagePlugin : UastLanguagePlugin { class KotlinUastLanguagePlugin : UastLanguagePlugin {
override val priority = 10 override val priority = 10
private val javaPlugin by lz { UastLanguagePlugin.getInstances().first { it is JavaUastLanguagePlugin } }
override val language: Language override val language: Language
get() = KotlinLanguage.INSTANCE get() = KotlinLanguage.INSTANCE
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
-1
View File
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
import org.jetbrains.uast.* import org.jetbrains.uast.*
import org.jetbrains.uast.java.annotations
import org.jetbrains.uast.java.internal.JavaUElementWithComments import org.jetbrains.uast.java.internal.JavaUElementWithComments
import org.jetbrains.uast.kotlin.* import org.jetbrains.uast.kotlin.*
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
+1 -2
View File
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.types.typeUtil.nullability
import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.SmartList
import org.jetbrains.uast.* import org.jetbrains.uast.*
import org.jetbrains.uast.internal.acceptList import org.jetbrains.uast.internal.acceptList
import org.jetbrains.uast.java.JavaAbstractUExpression
import org.jetbrains.uast.kotlin.declarations.UastLightIdentifier import org.jetbrains.uast.kotlin.declarations.UastLightIdentifier
import org.jetbrains.uast.kotlin.internal.KotlinUElementWithComments import org.jetbrains.uast.kotlin.internal.KotlinUElementWithComments
import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
@@ -406,7 +405,7 @@ open class KotlinUEnumConstant(
override val psi: PsiEnumConstant, override val psi: PsiEnumConstant,
override val sourcePsi: KtElement?, override val sourcePsi: KtElement?,
private val givenParent: UElement? private val givenParent: UElement?
) : JavaAbstractUExpression(), USimpleNameReferenceExpression { ) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression {
override val javaPsi: PsiElement? override val javaPsi: PsiElement?
get() = psi get() = psi