mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Uast: further removal of deprecated getLanguagePlugin (IDEA-220367)
GitOrigin-RevId: 9adfcb6d24779315b7991402fa7102e677608d7e
This commit is contained in:
committed by
intellij-monorepo-bot
parent
545ceeee33
commit
68a33d2ab0
@@ -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<UMethod>(method, aClass).sourcePsi ?: continue@loop
|
||||
else -> aClass.sourcePsi?.let { UastFacade.findPlugin(it)?.convertOpt<UMethod>(method, aClass)?.sourcePsi } ?: continue@loop
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -66,8 +66,8 @@ infix fun String?.ofType(type: PsiType?): UParameterInfo = UParameterInfo(type,
|
||||
|
||||
@ApiStatus.Experimental
|
||||
inline fun <reified T : UElement> 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 <reified T : UElement> T.refreshed() = sourcePsi?.toUElementOfType<T>
|
||||
|
||||
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) }
|
||||
|
||||
|
||||
@@ -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<JavaUAnnotation> by lz { sourcePsi.annotations.map { JavaUAnnotation(it, this) } }
|
||||
|
||||
@@ -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<JavaUAnnotation> by lz { sourcePsi.annotations.map { JavaUAnnotation(it, this) } }
|
||||
|
||||
@@ -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<JavaUAnnotation> by lz { javaPsi.annotations.map { JavaUAnnotation(it, this) } }
|
||||
override val typeReference: UTypeReferenceExpression? by lz {
|
||||
getLanguagePlugin().convertOpt<UTypeReferenceExpression>(javaPsi.typeElement, this)
|
||||
javaPsi.typeElement?.let { UastFacade.findPlugin(it)?.convertOpt<UTypeReferenceExpression>(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<UClass>(sourcePsi.initializingClass, this) }
|
||||
override val initializingClass: UClass? by lz { UastFacade.findPlugin(sourcePsi)?.convertOpt<UClass>(sourcePsi.initializingClass, this) }
|
||||
|
||||
@Suppress("OverridingDeprecatedMember")
|
||||
override val psi: PsiEnumConstant
|
||||
@@ -135,7 +135,7 @@ open class JavaUEnumConstant(
|
||||
|
||||
override val valueArguments: List<UExpression> 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()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user