From 68a33d2ab0e154d441b5a06170fe579278ec0fec Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Mon, 12 Aug 2019 15:18:44 +0300 Subject: [PATCH] Uast: further removal of deprecated `getLanguagePlugin` (IDEA-220367) GitOrigin-RevId: 9adfcb6d24779315b7991402fa7102e677608d7e --- .../src/inspections/NonDefaultConstructorInspection.kt | 6 +++--- .../jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt | 2 +- .../jetbrains/uast/generate/UastCodeGenerationPlugin.kt | 6 +++--- .../uast/java/declarations/JavaUClassInitializer.kt | 2 +- .../org/jetbrains/uast/java/declarations/JavaUMethod.kt | 2 +- .../org/jetbrains/uast/java/declarations/JavaUVariable.kt | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt b/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt index 9254316a39d7..ee349eafad2e 100644 --- a/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt +++ b/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt @@ -21,8 +21,8 @@ import org.jetbrains.idea.devkit.dom.ExtensionPoint.Area import org.jetbrains.idea.devkit.util.processExtensionDeclarations import org.jetbrains.uast.UClass import org.jetbrains.uast.UMethod -import org.jetbrains.uast.convert -import org.jetbrains.uast.getLanguagePlugin +import org.jetbrains.uast.UastFacade +import org.jetbrains.uast.convertOpt private const val serviceBeanFqn = "com.intellij.openapi.components.ServiceDescriptor" @@ -81,7 +81,7 @@ class NonDefaultConstructorInspection : DevKitUastInspectionBase() { // kotlin is not physical, but here only physical is expected, so, convert to uast element and use sourcePsi val anchorElement = when { method.isPhysical -> method - else -> aClass.getLanguagePlugin().convert(method, aClass).sourcePsi ?: continue@loop + else -> aClass.sourcePsi?.let { UastFacade.findPlugin(it)?.convertOpt(method, aClass)?.sourcePsi } ?: continue@loop } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt index f2633ee1db09..1aa08db4b0aa 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt @@ -86,7 +86,7 @@ class GrUParameter(val grElement: GrParameter, override val uastInitializer: UExpression? by lazy { val initializer = grElement.initializerGroovy ?: return@lazy null - getLanguagePlugin().convertElement(initializer, this) as? UExpression + UastFacade.findPlugin(initializer)?.convertElement(initializer, this) as? UExpression } override val typeReference: UTypeReferenceExpression? = null //not implemented diff --git a/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt b/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt index e6b5a156ea44..9ee8718f28f0 100644 --- a/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt +++ b/uast/uast-common/src/org/jetbrains/uast/generate/UastCodeGenerationPlugin.kt @@ -66,8 +66,8 @@ infix fun String?.ofType(type: PsiType?): UParameterInfo = UParameterInfo(type, @ApiStatus.Experimental inline fun UElement.replace(newElement: T): T? = - this.getLanguagePlugin() - .let { UastCodeGenerationPlugin.byLanguage(it.language) } + this.withContainingElements.mapNotNull { it.sourcePsi }.firstOrNull() + ?.let { UastCodeGenerationPlugin.byLanguage(it.language) } ?.replace(this, newElement, T::class.java) @ApiStatus.Experimental @@ -75,5 +75,5 @@ inline fun T.refreshed() = sourcePsi?.toUElementOfType val UElement.generationPlugin: UastCodeGenerationPlugin? @ApiStatus.Experimental - get() = getLanguagePlugin().let { UastCodeGenerationPlugin.byLanguage(it.language) } + get() = this.withContainingElements.mapNotNull { it.sourcePsi }.firstOrNull()?.let { UastCodeGenerationPlugin.byLanguage(it.language) } diff --git a/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUClassInitializer.kt b/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUClassInitializer.kt index 6f7baef3fb84..5a95e3269eec 100644 --- a/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUClassInitializer.kt +++ b/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUClassInitializer.kt @@ -21,7 +21,7 @@ class JavaUClassInitializer( get() = null override val uastBody: UExpression by lz { - getLanguagePlugin().convertElement(sourcePsi.body, this, null) as? UExpression ?: UastEmptyExpression(this) + UastFacade.findPlugin(sourcePsi.body)?.convertElement(sourcePsi.body, this, null) as? UExpression ?: UastEmptyExpression(this) } override val uAnnotations: List by lz { sourcePsi.annotations.map { JavaUAnnotation(it, this) } } diff --git a/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUMethod.kt b/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUMethod.kt index ce63ee0c4dad..d2ec98b29595 100644 --- a/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUMethod.kt +++ b/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUMethod.kt @@ -22,7 +22,7 @@ open class JavaUMethod( override val uastBody: UExpression? by lz { val body = sourcePsi.body ?: return@lz null - getLanguagePlugin().convertElement(body, this) as? UExpression + UastFacade.findPlugin(body)?.convertElement(body, this) as? UExpression } override val uAnnotations: List by lz { sourcePsi.annotations.map { JavaUAnnotation(it, this) } } diff --git a/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt b/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt index 04d5ad7dc0b3..fdaa0561eaa7 100644 --- a/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt +++ b/uast/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt @@ -18,12 +18,12 @@ abstract class AbstractJavaUVariable(givenParent: UElement?) : JavaAbstractUElem override val uastInitializer: UExpression? by lz { val initializer = javaPsi.initializer ?: return@lz null - getLanguagePlugin().convertElement(initializer, this) as? UExpression + UastFacade.findPlugin(initializer)?.convertElement(initializer, this) as? UExpression } override val uAnnotations: List by lz { javaPsi.annotations.map { JavaUAnnotation(it, this) } } override val typeReference: UTypeReferenceExpression? by lz { - getLanguagePlugin().convertOpt(javaPsi.typeElement, this) + javaPsi.typeElement?.let { UastFacade.findPlugin(it)?.convertOpt(javaPsi.typeElement, this) } } override val uastAnchor: UIdentifier @@ -108,7 +108,7 @@ open class JavaUEnumConstant( override val sourcePsi: PsiEnumConstant, givenParent: UElement? ) : AbstractJavaUVariable(givenParent), UEnumConstantEx, UCallExpressionEx, PsiEnumConstant by sourcePsi, UMultiResolvable { - override val initializingClass: UClass? by lz { getLanguagePlugin().convertOpt(sourcePsi.initializingClass, this) } + override val initializingClass: UClass? by lz { UastFacade.findPlugin(sourcePsi)?.convertOpt(sourcePsi.initializingClass, this) } @Suppress("OverridingDeprecatedMember") override val psi: PsiEnumConstant @@ -135,7 +135,7 @@ open class JavaUEnumConstant( override val valueArguments: List by lz { sourcePsi.argumentList?.expressions?.map { - getLanguagePlugin().convertElement(it, this) as? UExpression ?: UastEmptyExpression(this) + UastFacade.findPlugin(it)?.convertElement(it, this) as? UExpression ?: UastEmptyExpression(this) } ?: emptyList() }