Skip to content

Commit b29af86

Browse files
committed
Replace deprecated constants with PsiTypes methods
1 parent ef3663e commit b29af86

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/main/kotlin/platform/mixin/handlers/mixinextras/WrapWithConditionHandler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ package com.demonwav.mcdev.platform.mixin.handlers.mixinextras
2323
import com.demonwav.mcdev.platform.mixin.inspection.injector.ParameterGroup
2424
import com.intellij.psi.PsiAnnotation
2525
import com.intellij.psi.PsiType
26+
import com.intellij.psi.PsiTypes
2627
import org.objectweb.asm.Type
2728
import org.objectweb.asm.tree.AbstractInsnNode
2829
import org.objectweb.asm.tree.ClassNode
@@ -44,6 +45,6 @@ class WrapWithConditionHandler : MixinExtrasInjectorAnnotationHandler() {
4445
insn: AbstractInsnNode
4546
): Pair<ParameterGroup, PsiType>? {
4647
val params = getPsiParameters(insn, targetClass, annotation) ?: return null
47-
return ParameterGroup(params) to PsiType.BOOLEAN
48+
return ParameterGroup(params) to PsiTypes.booleanType()
4849
}
4950
}

src/main/kotlin/platform/mixin/inspection/injector/InjectCouldBeOverwriteInspection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ import com.intellij.psi.PsiMethodCallExpression
7272
import com.intellij.psi.PsiParameter
7373
import com.intellij.psi.PsiParameterList
7474
import com.intellij.psi.PsiReturnStatement
75-
import com.intellij.psi.PsiType
75+
import com.intellij.psi.PsiTypes
7676
import com.intellij.psi.codeStyle.VariableKind
7777
import com.intellij.psi.impl.light.LightParameter
7878
import com.intellij.psi.search.LocalSearchScope
@@ -149,7 +149,7 @@ class InjectCouldBeOverwriteInspection : MixinInspection() {
149149
memState.applyCondition(ciVar.eq(stableCiVar))
150150
val isCancelledVar = PlainDescriptor.createVariableValue(
151151
factory,
152-
LightParameter("isCancelled", PsiType.BOOLEAN, methodBody)
152+
LightParameter("isCancelled", PsiTypes.booleanType(), methodBody)
153153
)
154154
memState.setVarValue(isCancelledVar, falseValue)
155155

src/main/kotlin/platform/mixin/util/Mixin.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import com.intellij.psi.PsiMethod
4444
import com.intellij.psi.PsiParameter
4545
import com.intellij.psi.PsiPrimitiveType
4646
import com.intellij.psi.PsiType
47+
import com.intellij.psi.PsiTypes
4748
import com.intellij.psi.search.GlobalSearchScope
4849
import com.intellij.psi.util.InheritanceUtil
4950
import com.intellij.psi.util.PsiModificationTracker
@@ -165,7 +166,7 @@ fun isAssignable(left: PsiType, right: PsiType, allowPrimitiveConversion: Boolea
165166
left is PsiArrayType -> right is PsiArrayType && isAssignable(left.componentType, right.componentType)
166167
else -> {
167168
if (left !is PsiClassType || right !is PsiClassType) {
168-
if (right == PsiType.NULL && left !is PsiPrimitiveType) {
169+
if (right == PsiTypes.nullType() && left !is PsiPrimitiveType) {
169170
return true
170171
}
171172
if (!allowPrimitiveConversion && (left is PsiPrimitiveType || right is PsiPrimitiveType)) {

0 commit comments

Comments
 (0)