Replace deprecated PsiType constants usages

RedNesto · RedNesto · commit 44661fb8f7b5 · 2023-03-19T16:06:52.000+01:00
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,3 +13,5 @@ rootProject.name = "MinecraftDev"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 include("mixin-test-data")
+
+startParameter.warningMode = WarningMode.All
diff --git a/src/main/kotlin/insight/ColorUtil.kt b/src/main/kotlin/insight/ColorUtil.kt
@@ -18,6 +18,7 @@ import com.demonwav.mcdev.util.runWriteAction
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.JVMElementFactories
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.search.GlobalSearchScope
 import java.awt.Color
 import java.util.Locale
@@ -142,10 +143,10 @@ private fun findColorFromCallExpression(
 
     return when {
         // Single Integer Argument
-        types.size == 1 && types[0] == PsiType.INT ->
+        types.size == 1 && types[0] == PsiTypes.intType() ->
             colorFromSingleArgument(arguments[0])?.let { it to arguments[0] }
         // Triple Integer Argument
-        types.size == 3 && types.all { it == PsiType.INT } ->
+        types.size == 3 && types.all { it == PsiTypes.intType() } ->
             colorFromThreeArguments(arguments)?.let { it to methodExpression }
         vectorClasses != null && types.size == 1 -> {
             val scope = GlobalSearchScope.allScope(project)
diff --git a/src/main/kotlin/platform/mixin/action/GenerateAccessorHandler.kt b/src/main/kotlin/platform/mixin/action/GenerateAccessorHandler.kt
@@ -56,7 +56,7 @@ import com.intellij.psi.PsiField
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.uiDesigner.core.GridConstraints
@@ -397,7 +397,7 @@ class GenerateAccessorHandler : GenerateMembersHandlerBase("Generate Accessor/In
         val accessors = arrayListOf<PsiMethod>()
 
         if (generateGetter) {
-            val prefix = if (target.type == PsiType.BOOLEAN) "is" else "get"
+            val prefix = if (target.type == PsiTypes.booleanType()) "is" else "get"
             val method = factory.createMethodFromText(
                 """
                 @${MixinConstants.Annotations.ACCESSOR}
diff --git a/src/main/kotlin/platform/mixin/config/inspection/ConfigValueInspection.kt b/src/main/kotlin/platform/mixin/config/inspection/ConfigValueInspection.kt
@@ -36,6 +36,7 @@ import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.util.PsiUtil
 
 class ConfigValueInspection : MixinConfigInspection() {
@@ -56,8 +57,9 @@ class ConfigValueInspection : MixinConfigInspection() {
 
         private fun checkValue(type: PsiType, value: JsonValue) {
             val valid = when (type) {
-                PsiType.BOOLEAN -> value is JsonBooleanLiteral
-                PsiType.BYTE, PsiType.DOUBLE, PsiType.FLOAT, PsiType.INT, PsiType.LONG, PsiType.SHORT ->
+                PsiTypes.booleanType() -> value is JsonBooleanLiteral
+                PsiTypes.byteType(), PsiTypes.doubleType(), PsiTypes.floatType(), PsiTypes.intType(),
+                PsiTypes.longType(), PsiTypes.shortType() ->
                     value is JsonNumberLiteral
                 is PsiArrayType -> checkArray(type.componentType, value)
                 else -> checkObject(type, value)
diff --git a/src/main/kotlin/platform/mixin/folding/AccessorMixinFoldingBuilder.kt b/src/main/kotlin/platform/mixin/folding/AccessorMixinFoldingBuilder.kt
@@ -29,8 +29,8 @@ import com.intellij.psi.PsiIdentifier
 import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.PsiMethodCallExpression
 import com.intellij.psi.PsiParenthesizedExpression
-import com.intellij.psi.PsiType
 import com.intellij.psi.PsiTypeCastExpression
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.util.elementType
 import com.intellij.psi.util.parentOfType
 
@@ -83,7 +83,7 @@ class AccessorMixinFoldingBuilder : CustomFoldingBuilder() {
         if (method.hasAnnotation(ACCESSOR)) {
             val name = AccessorHandler.getInstance()?.findAccessorTargetForReference(method)?.element?.name
                 ?: return null
-            return if (method.returnType == PsiType.VOID) {
+            return if (method.returnType == PsiTypes.voidType()) {
                 "$name = "
             } else {
                 name
diff --git a/src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt b/src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.SmartPsiElementPointer
 import com.intellij.psi.util.createSmartPointer
 import com.intellij.psi.util.parentOfType
@@ -47,7 +47,7 @@ class AccessorHandler : MixinMemberAnnotationHandler {
             if (!method.hasParameters() && accessorInfo.type.allowGetters) {
                 it.desc == method.returnType?.descriptor
             } else if (
-                PsiType.VOID == method.returnType && method.parameterList.parametersCount == 1 &&
+                PsiTypes.voidType() == method.returnType && method.parameterList.parametersCount == 1 &&
                 accessorInfo.type.allowSetters
             ) {
                 it.desc == method.parameterList.parameters[0].type.descriptor
diff --git a/src/main/kotlin/platform/mixin/handlers/InjectAnnotationHandler.kt b/src/main/kotlin/platform/mixin/handlers/InjectAnnotationHandler.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiQualifiedReference
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.util.parentOfType
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
@@ -55,7 +55,7 @@ class InjectAnnotationHandler : InjectorAnnotationHandler() {
         result.add(
             ParameterGroup(
                 listOf(
-                    if (returnType == PsiType.VOID) {
+                    if (returnType == PsiTypes.voidType()) {
                         Parameter("ci", callbackInfoType(annotation.project))
                     } else {
                         Parameter(
@@ -117,7 +117,7 @@ class InjectAnnotationHandler : InjectorAnnotationHandler() {
             }
         }
 
-        return listOf(MethodSignature(result, PsiType.VOID))
+        return listOf(MethodSignature(result, PsiTypes.voidType()))
     }
 
     override val allowCoerce = true
diff --git a/src/main/kotlin/platform/mixin/handlers/ModifyArgsHandler.kt b/src/main/kotlin/platform/mixin/handlers/ModifyArgsHandler.kt
@@ -16,7 +16,7 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Classes.ARGS
 import com.demonwav.mcdev.util.Parameter
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotation
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodInsnNode
@@ -44,7 +44,7 @@ class ModifyArgsHandler : InjectorAnnotationHandler() {
                         isVarargs = true,
                     ),
                 ),
-                PsiType.VOID,
+                PsiTypes.voidType(),
             ),
         )
     }
diff --git a/src/main/kotlin/platform/mixin/handlers/ModifyConstantHandler.kt b/src/main/kotlin/platform/mixin/handlers/ModifyConstantHandler.kt
@@ -30,6 +30,7 @@ import com.intellij.psi.PsiEnumConstant
 import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiReferenceExpression
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.search.GlobalSearchScope
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
@@ -136,10 +137,10 @@ class ModifyConstantHandler : InjectorAnnotationHandler() {
         return constantInfos.asSequence().map {
             when (it.constantInfo.constant) {
                 null -> PsiType.getJavaLangObject(psiManager, annotation.resolveScope)
-                is Int -> PsiType.INT
-                is Float -> PsiType.FLOAT
-                is Long -> PsiType.LONG
-                is Double -> PsiType.DOUBLE
+                is Int -> PsiTypes.intType()
+                is Float -> PsiTypes.floatType()
+                is Long -> PsiTypes.longType()
+                is Double -> PsiTypes.doubleType()
                 is String -> PsiType.getJavaLangString(psiManager, annotation.resolveScope)
                 is Type -> PsiType.getJavaLangClass(psiManager, annotation.resolveScope)
                 else -> throw IllegalStateException("Unknown constant type: ${it.constantInfo.constant.javaClass.name}")
diff --git a/src/main/kotlin/platform/mixin/handlers/RedirectInjectorHandler.kt b/src/main/kotlin/platform/mixin/handlers/RedirectInjectorHandler.kt
@@ -28,6 +28,7 @@ import com.intellij.psi.PsiArrayType
 import com.intellij.psi.PsiElementFactory
 import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -186,7 +187,7 @@ class RedirectInjectorHandler : InjectorAnnotationHandler() {
             return listOf(
                 MethodSignature(
                     listOf(ParameterGroup(parameters)),
-                    PsiType.VOID,
+                    PsiTypes.voidType(),
                 ),
             )
         }
@@ -280,7 +281,7 @@ class RedirectInjectorHandler : InjectorAnnotationHandler() {
                             ),
                         ),
                     ),
-                    PsiType.INT,
+                    PsiTypes.intType(),
                 ),
             )
         }
@@ -312,7 +313,7 @@ class RedirectInjectorHandler : InjectorAnnotationHandler() {
                         ParameterGroup(
                             listOf(
                                 Parameter("array", psiArrayType),
-                                Parameter("index", PsiType.INT),
+                                Parameter("index", PsiTypes.intType()),
                             ),
                         ),
                     ),
@@ -348,12 +349,12 @@ class RedirectInjectorHandler : InjectorAnnotationHandler() {
                         ParameterGroup(
                             listOf(
                                 Parameter("array", psiArrayType),
-                                Parameter("index", PsiType.INT),
+                                Parameter("index", PsiTypes.intType()),
                                 Parameter("value", psiArrayType.componentType),
                             ),
                         ),
                     ),
-                    PsiType.VOID,
+                    PsiTypes.voidType(),
                 ),
             )
         }
@@ -418,7 +419,7 @@ class RedirectInjectorHandler : InjectorAnnotationHandler() {
                 ),
             )
             return listOf(
-                MethodSignature(listOf(parameters), PsiType.BOOLEAN),
+                MethodSignature(listOf(parameters), PsiTypes.booleanType()),
                 MethodSignature(listOf(parameters), classType),
             )
         }
diff --git a/src/main/kotlin/platform/mixin/handlers/injectionPoint/ConstantStringMethodInjectionPoint.kt b/src/main/kotlin/platform/mixin/handlers/injectionPoint/ConstantStringMethodInjectionPoint.kt
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiMethodCallExpression
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
@@ -54,7 +55,7 @@ class ConstantStringMethodInjectionPoint : AbstractMethodInjectionPoint() {
     ) : NavigationVisitor() {
         private fun isConstantStringMethodCall(expression: PsiMethodCallExpression): Boolean {
             // Must return void
-            if (expression.type != PsiType.VOID) {
+            if (expression.type != PsiTypes.voidType()) {
                 return false
             }
 
diff --git a/src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt b/src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt
@@ -32,7 +32,7 @@ import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiReferenceExpression
 import com.intellij.psi.PsiThisExpression
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.PsiUnaryExpression
 import com.intellij.psi.PsiVariable
 import com.intellij.psi.util.PsiUtil
@@ -140,10 +140,10 @@ abstract class AbstractLoadInjectionPoint(private val store: Boolean) : Injectio
                 val resolved = expression.resolve() as? PsiVariable ?: return
                 val type = resolved.type
                 if (type is PsiPrimitiveType &&
-                    type != PsiType.FLOAT &&
-                    type != PsiType.DOUBLE &&
-                    type != PsiType.LONG &&
-                    type != PsiType.BOOLEAN
+                    type != PsiTypes.floatType() &&
+                    type != PsiTypes.doubleType() &&
+                    type != PsiTypes.longType() &&
+                    type != PsiTypes.booleanType()
                 ) {
                     // ModifyVariable currently cannot handle iinc
                     val parentExpr = PsiUtil.skipParenthesizedExprUp(expression.parent)
@@ -273,9 +273,9 @@ abstract class AbstractLoadInjectionPoint(private val store: Boolean) : Injectio
             var opcode = when (info.type) {
                 null -> null
                 !is PsiPrimitiveType -> Opcodes.ALOAD
-                PsiType.LONG -> Opcodes.LLOAD
-                PsiType.FLOAT -> Opcodes.FLOAD
-                PsiType.DOUBLE -> Opcodes.DLOAD
+                PsiTypes.longType() -> Opcodes.LLOAD
+                PsiTypes.floatType() -> Opcodes.FLOAD
+                PsiTypes.doubleType() -> Opcodes.DLOAD
                 else -> Opcodes.ILOAD
             }
             if (store && opcode != null) {
diff --git a/src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt b/src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiLambdaExpression
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiMethodReferenceExpression
 import com.intellij.psi.PsiReturnStatement
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.controlFlow.ControlFlowUtil
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -85,13 +85,13 @@ abstract class AbstractReturnInjectionPoint(private val tailOnly: Boolean) : Inj
                         return
                     }
                     val returnType = LambdaUtil.getFunctionalInterfaceReturnType(executableElement) ?: return
-                    if (returnType != PsiType.VOID) {
+                    if (returnType != PsiTypes.voidType()) {
                         return
                     }
                     body
                 }
                 is PsiMethod -> {
-                    if (executableElement.returnType != PsiType.VOID && !executableElement.isConstructor) {
+                    if (executableElement.returnType != PsiTypes.voidType() && !executableElement.isConstructor) {
                         return
                     }
                     executableElement.body ?: return
diff --git a/src/main/kotlin/platform/mixin/inspection/injector/ParameterGroup.kt b/src/main/kotlin/platform/mixin/inspection/injector/ParameterGroup.kt
@@ -17,6 +17,7 @@ import com.demonwav.mcdev.util.normalize
 import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 
 data class ParameterGroup(
     val parameters: List<Parameter>,
@@ -55,7 +56,13 @@ data class ParameterGroup(
     }
 
     companion object {
-        private val INT_TYPES = setOf(PsiType.INT, PsiType.SHORT, PsiType.CHAR, PsiType.BYTE, PsiType.BOOLEAN)
+        private val INT_TYPES = setOf(
+            PsiTypes.intType(),
+            PsiTypes.shortType(),
+            PsiTypes.charType(),
+            PsiTypes.byteType(),
+            PsiTypes.booleanType()
+        )
 
         private fun matchParameter(expectedType: PsiType, parameter: PsiParameter, allowCoerce: Boolean): Boolean {
             val normalizedExpected = expectedType.normalize()
diff --git a/src/main/kotlin/platform/mixin/reference/MixinSelectors.kt b/src/main/kotlin/platform/mixin/reference/MixinSelectors.kt
@@ -48,7 +48,7 @@ import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiNameValuePair
-import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.searches.AnnotatedMembersSearch
 import com.intellij.psi.util.InheritanceUtil
@@ -563,7 +563,7 @@ class DescSelectorParser : DynamicSelectorParser("Desc", "mixin:Desc") {
             val name = descAnnotation.findAttributeValue("value")?.constantStringValue ?: return null
 
             val argTypes = descAnnotation.findAttributeValue("args")?.resolveTypeArray() ?: emptyList()
-            val ret = descAnnotation.findAttributeValue("ret")?.resolveType() ?: PsiType.VOID
+            val ret = descAnnotation.findAttributeValue("ret")?.resolveType() ?: PsiTypes.voidType()
             val desc = Type.getMethodDescriptor(
                 Type.getType(ret.descriptor),
                 *argTypes.mapToArray { Type.getType(it.descriptor) },
diff --git a/src/main/kotlin/platform/mixin/util/LocalVariables.kt b/src/main/kotlin/platform/mixin/util/LocalVariables.kt
@@ -58,6 +58,7 @@ import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiStatement
 import com.intellij.psi.PsiType
+import com.intellij.psi.PsiTypes
 import com.intellij.psi.PsiVariable
 import com.intellij.psi.controlFlow.ControlFlow
 import com.intellij.psi.controlFlow.ControlFlowFactory
@@ -212,7 +213,7 @@ object LocalVariables {
                         val localsHere = this.locals[offset]
                             ?: arrayOfNulls<SourceLocalVariable>(variable.index + 1).also { this.locals[offset] = it }
                         localsHere[variable.index] = variable
-                        if (variable.type == PsiType.LONG || variable.type == PsiType.DOUBLE) {
+                        if (variable.type == PsiTypes.longType() || variable.type == PsiTypes.doubleType()) {
                             if (variable.index + 1 < localsHere.size) {
                                 localsHere[variable.index + 1] = null
                             }
@@ -311,7 +312,7 @@ object LocalVariables {
     }
 
     private val PsiVariable.isDoubleSlot: Boolean
-        get() = type == PsiType.DOUBLE || type == PsiType.LONG
+        get() = type == PsiTypes.doubleType() || type == PsiTypes.longType()
 
     private fun PsiForeachStatement.getExtraLocals(): List<SourceLocalVariable> {
         val localIndex = getUserData(LOCAL_INDEX_KEY)!!
@@ -330,15 +331,15 @@ object LocalVariables {
                 // length
                 SourceLocalVariable(
                     "var${localIndex + 1}",
-                    PsiType.INT,
+                    PsiTypes.intType(),
                     localIndex + 1,
                     implicitStoreCountBefore = 1,
                     implicitLoadCountAfter = 1,
                 ),
                 // index
                 SourceLocalVariable(
                     "var${localIndex + 2}",
-                    PsiType.INT,
+                    PsiTypes.intType(),
                     localIndex + 2,
                     implicitStoreCountBefore = 1,
                     implicitLoadCountBefore = 1,
diff --git a/src/main/kotlin/platform/sponge/reference/SpongeReferenceContributor.kt b/src/main/kotlin/platform/sponge/reference/SpongeReferenceContributor.kt
diff --git a/src/main/kotlin/util/bytecode-utils.kt b/src/main/kotlin/util/bytecode-utils.kt
diff --git a/src/main/kotlin/util/code-gen.kt b/src/main/kotlin/util/code-gen.kt
