Replace usages of now-deprecated InspectionGadgetsFix

RedNesto · RedNesto · commit 5783eac20911 · 2025-06-05T15:04:41.000+02:00
diff --git a/src/main/kotlin/inspection/IsCancelled.kt b/src/main/kotlin/inspection/IsCancelled.kt
@@ -21,21 +21,17 @@
 package com.demonwav.mcdev.inspection
 
 import com.demonwav.mcdev.asset.MCDevBundle
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.siyeh.ig.InspectionGadgetsFix
 
 class IsCancelled(
     fix: (ProblemDescriptor) -> Unit,
     val errorString: String,
 ) {
-    val buildFix: InspectionGadgetsFix
-
-    init {
-        this.buildFix = object : InspectionGadgetsFix() {
-            override fun doFix(project: Project, descriptor: ProblemDescriptor) = fix(descriptor)
-            override fun getName() = "Simplify"
-            override fun getFamilyName() = MCDevBundle("inspection.is_cancelled.name")
-        }
+    val buildFix: LocalQuickFix = object : LocalQuickFix {
+        override fun applyFix(project: Project, descriptor: ProblemDescriptor) = fix(descriptor)
+        override fun getName() = "Simplify"
+        override fun getFamilyName() = MCDevBundle("inspection.is_cancelled.name")
     }
 }
diff --git a/src/main/kotlin/inspection/IsCancelledInspection.kt b/src/main/kotlin/inspection/IsCancelledInspection.kt
@@ -23,11 +23,11 @@ package com.demonwav.mcdev.inspection
 import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.facet.MinecraftFacet
 import com.demonwav.mcdev.util.mapFirstNotNull
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiMethodCallExpression
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class IsCancelledInspection : BaseInspection() {
@@ -41,7 +41,7 @@ class IsCancelledInspection : BaseInspection() {
         return useless.errorString
     }
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any): LocalQuickFix? {
         val useless = infos[0] as? IsCancelled
         return useless?.buildFix
     }
diff --git a/src/main/kotlin/platform/bukkit/inspection/BukkitListenerImplementedInspection.kt b/src/main/kotlin/platform/bukkit/inspection/BukkitListenerImplementedInspection.kt
@@ -23,13 +23,13 @@ package com.demonwav.mcdev.platform.bukkit.inspection
 import com.demonwav.mcdev.platform.bukkit.util.BukkitConstants
 import com.demonwav.mcdev.util.addImplements
 import com.demonwav.mcdev.util.extendsOrImplements
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.createSmartPointer
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class BukkitListenerImplementedInspection : BaseInspection() {
@@ -44,10 +44,10 @@ class BukkitListenerImplementedInspection : BaseInspection() {
     override fun getStaticDescription() =
         "All Bukkit @EventHandler methods must reside in a class that implements Listener."
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix {
+    override fun buildFix(vararg infos: Any): LocalQuickFix {
         val classPointer = (infos[0] as PsiClass).createSmartPointer()
-        return object : InspectionGadgetsFix() {
-            override fun doFix(project: Project, descriptor: ProblemDescriptor) {
+        return object : LocalQuickFix {
+            override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
                 classPointer.element?.addImplements(BukkitConstants.LISTENER_CLASS)
             }
 
diff --git a/src/main/kotlin/platform/bungeecord/inspection/BungeeCordListenerImplementedInspection.kt b/src/main/kotlin/platform/bungeecord/inspection/BungeeCordListenerImplementedInspection.kt
@@ -23,13 +23,13 @@ package com.demonwav.mcdev.platform.bungeecord.inspection
 import com.demonwav.mcdev.platform.bungeecord.util.BungeeCordConstants
 import com.demonwav.mcdev.util.addImplements
 import com.demonwav.mcdev.util.extendsOrImplements
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.createSmartPointer
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class BungeeCordListenerImplementedInspection : BaseInspection() {
@@ -43,10 +43,10 @@ class BungeeCordListenerImplementedInspection : BaseInspection() {
     override fun getStaticDescription() =
         "All BungeeCord @EventHandler methods must reside in a class that implements Listener."
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix {
+    override fun buildFix(vararg infos: Any): LocalQuickFix {
         val classPointer = (infos[0] as PsiClass).createSmartPointer()
-        return object : InspectionGadgetsFix() {
-            override fun doFix(project: Project, descriptor: ProblemDescriptor) {
+        return object : LocalQuickFix {
+            override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
                 classPointer.element?.addImplements(BungeeCordConstants.LISTENER_CLASS)
             }
 
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/FieldDeclarationSideOnlyInspection.kt b/src/main/kotlin/platform/forge/inspections/sideonly/FieldDeclarationSideOnlyInspection.kt
@@ -20,12 +20,12 @@
 
 package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiField
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class FieldDeclarationSideOnlyInspection : BaseInspection() {
@@ -45,7 +45,7 @@ class FieldDeclarationSideOnlyInspection : BaseInspection() {
             "everything with it, @SideOnly annotated fields are usually useless"
     }
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any): LocalQuickFix? {
         val annotation = infos[3] as PsiAnnotation
 
         return if (annotation.isWritable) {
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/LocalVariableDeclarationSideOnlyInspection.kt b/src/main/kotlin/platform/forge/inspections/sideonly/LocalVariableDeclarationSideOnlyInspection.kt
@@ -21,12 +21,12 @@
 package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
 import com.demonwav.mcdev.util.findContainingClass
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiLocalVariable
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class LocalVariableDeclarationSideOnlyInspection : BaseInspection() {
@@ -43,7 +43,7 @@ class LocalVariableDeclarationSideOnlyInspection : BaseInspection() {
         "A variable whose class declaration is annotated with @SideOnly for one side cannot be declared in a class" +
             " or method that does not match the same side."
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any): LocalQuickFix? {
         val annotation = infos[3] as PsiAnnotation
 
         return if (annotation.isWritable) {
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/MethodCallSideOnlyInspection.kt b/src/main/kotlin/platform/forge/inspections/sideonly/MethodCallSideOnlyInspection.kt
@@ -22,14 +22,14 @@ package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
 import com.demonwav.mcdev.platform.forge.util.ForgeConstants
 import com.demonwav.mcdev.util.findContainingClass
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiMethodCallExpression
 import com.intellij.psi.PsiReferenceExpression
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class MethodCallSideOnlyInspection : BaseInspection() {
@@ -47,7 +47,7 @@ class MethodCallSideOnlyInspection : BaseInspection() {
         "Methods which are declared with a @SideOnly annotation can only be " +
             "used in matching @SideOnly classes and methods."
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any): LocalQuickFix? {
         val annotation = infos[3] as PsiAnnotation
 
         return if (annotation.isWritable) {
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/MethodSideOnlyInspection.kt b/src/main/kotlin/platform/forge/inspections/sideonly/MethodSideOnlyInspection.kt
@@ -20,12 +20,12 @@
 
 package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiMethod
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class MethodSideOnlyInspection : BaseInspection() {
@@ -45,7 +45,7 @@ class MethodSideOnlyInspection : BaseInspection() {
             "everything with it, @SideOnly annotated methods are usually useless"
     }
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any): LocalQuickFix? {
         val error = infos[0] as Error
         val annotation = infos[3] as PsiAnnotation
 
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/NestedClassSideOnlyInspection.kt b/src/main/kotlin/platform/forge/inspections/sideonly/NestedClassSideOnlyInspection.kt
@@ -20,11 +20,11 @@
 
 package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClass
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class NestedClassSideOnlyInspection : BaseInspection() {
@@ -42,7 +42,7 @@ class NestedClassSideOnlyInspection : BaseInspection() {
             "brings everything with it, @SideOnly annotated nested classes are usually useless."
     }
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any): LocalQuickFix? {
         val annotation = infos[0] as PsiAnnotation
 
         return if (annotation.isWritable) {
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/NewExpressionSideOnlyInspection.kt b/src/main/kotlin/platform/forge/inspections/sideonly/NewExpressionSideOnlyInspection.kt
@@ -21,12 +21,12 @@
 package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
 import com.demonwav.mcdev.util.findContainingClass
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiNewExpression
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class NewExpressionSideOnlyInspection : BaseInspection() {
@@ -44,7 +44,7 @@ class NewExpressionSideOnlyInspection : BaseInspection() {
             "use @SideOnly annotated classes either."
     }
 
-    override fun buildFix(vararg infos: Any?): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any?): LocalQuickFix? {
         val annotation = infos[0] as? PsiAnnotation ?: return null
 
         return if (annotation.isWritable) {
diff --git a/src/main/kotlin/platform/forge/inspections/sideonly/RemoveAnnotationInspectionGadgetsFix.kt b/src/main/kotlin/platform/forge/inspections/sideonly/RemoveAnnotationInspectionGadgetsFix.kt
@@ -21,19 +21,19 @@
 package com.demonwav.mcdev.platform.forge.inspections.sideonly
 
 import com.demonwav.mcdev.util.findAnnotation
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiModifierListOwner
 import com.intellij.psi.util.findParentOfType
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class RemoveAnnotationInspectionGadgetsFix(
     private val annotationName: String,
     private val name: String
-) : InspectionGadgetsFix() {
+) : LocalQuickFix {
 
-    override fun doFix(project: Project, descriptor: ProblemDescriptor) {
+    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
         val decl = descriptor.psiElement.findParentOfType<PsiModifierListOwner>() ?: return
         decl.findAnnotation(annotationName)?.delete()
     }
diff --git a/src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt b/src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt
@@ -21,14 +21,14 @@
 package com.demonwav.mcdev.platform.forge.inspections.simpleimpl
 
 import com.demonwav.mcdev.util.findContainingClass
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
-import com.siyeh.ig.InspectionGadgetsFix
 
-object AddEmptyConstructorInspectionGadgetsFix : InspectionGadgetsFix() {
+object AddEmptyConstructorInspectionGadgetsFix : LocalQuickFix {
 
-    override fun doFix(project: Project, descriptor: ProblemDescriptor) {
+    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
         val clazz = descriptor.psiElement.findContainingClass() ?: return
         clazz.addBefore(JavaPsiFacade.getElementFactory(project).createConstructor(), clazz.methods[0])
     }
diff --git a/src/main/kotlin/platform/forge/inspections/simpleimpl/MissingMessageConstructorInspection.kt b/src/main/kotlin/platform/forge/inspections/simpleimpl/MissingMessageConstructorInspection.kt
@@ -20,10 +20,10 @@
 
 package com.demonwav.mcdev.platform.forge.inspections.simpleimpl
 
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.psi.PsiClass
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class MissingMessageConstructorInspection : BaseInspection() {
@@ -36,7 +36,7 @@ class MissingMessageConstructorInspection : BaseInspection() {
     override fun getStaticDescription() =
         "All implementations of IMessage and IMessageHandler must have an empty constructor"
 
-    override fun buildFix(vararg infos: Any?): InspectionGadgetsFix? {
+    override fun buildFix(vararg infos: Any?): LocalQuickFix? {
         val messageClass = infos[0] as PsiClass
 
         return if (messageClass.isWritable) {
diff --git a/src/main/kotlin/platform/mcp/inspections/StackEmptyInspection.kt b/src/main/kotlin/platform/mcp/inspections/StackEmptyInspection.kt
@@ -25,6 +25,7 @@ import com.demonwav.mcdev.platform.mcp.mappings.getMappedField
 import com.demonwav.mcdev.platform.mcp.mappings.getMappedMethod
 import com.demonwav.mcdev.util.findModule
 import com.demonwav.mcdev.util.fullQualifiedName
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
@@ -38,7 +39,6 @@ import com.intellij.psi.PsiReferenceExpression
 import com.intellij.psi.createSmartPointer
 import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
-import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
 class StackEmptyInspection : BaseInspection() {
@@ -59,13 +59,13 @@ class StackEmptyInspection : BaseInspection() {
             "When a stack in an inventory is shrunk, the instance is not replaced with ItemStack.EMPTY, but" +
             " the stack should still be considered empty. Instead, isEmpty() should be called."
 
-    override fun buildFix(vararg infos: Any): InspectionGadgetsFix {
+    override fun buildFix(vararg infos: Any): LocalQuickFix {
         val compareExpressionPointer = (infos[0] as PsiExpression).createSmartPointer()
         val binaryExpressionPointer = (infos[2] as PsiBinaryExpression).createSmartPointer()
-        return object : InspectionGadgetsFix() {
+        return object : LocalQuickFix {
             override fun getFamilyName() = "Replace with .isEmpty()"
 
-            override fun doFix(project: Project, descriptor: ProblemDescriptor) {
+            override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
                 val elementFactory = JavaPsiFacade.getElementFactory(project)
 
                 val compareExpression = compareExpressionPointer.element ?: return
diff --git a/src/main/kotlin/platform/sponge/inspection/SpongeWrongGetterTypeInspection.kt b/src/main/kotlin/platform/sponge/inspection/SpongeWrongGetterTypeInspection.kt
@@ -43,7 +43,6 @@ import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiSubstitutor
 import com.intellij.psi.PsiType
 import com.intellij.psi.util.TypeConversionUtil
-import com.siyeh.ig.InspectionGadgetsFix
 import java.util.function.Supplier
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.getContainingUClass
@@ -148,17 +147,17 @@ class SpongeWrongGetterTypeInspection : AbstractBaseUastLocalInspectionTool() {
         val elementFactory = JavaPsiFacade.getElementFactory(project)
 
         val expectedClassType = expectedType as? PsiClassType
-            ?: return InspectionGadgetsFix.EMPTY_ARRAY
+            ?: return LocalQuickFix.EMPTY_ARRAY
         val fixedClassType = if (isOptional(expectedClassType)) {
             val wrappedType = expectedClassType.parameters.first()
             val resolveResult = (wrappedType as? PsiClassType)?.resolveGenerics()
-                ?: return InspectionGadgetsFix.EMPTY_ARRAY
+                ?: return LocalQuickFix.EMPTY_ARRAY
             val element = resolveResult.element
-                ?: return InspectionGadgetsFix.EMPTY_ARRAY
+                ?: return LocalQuickFix.EMPTY_ARRAY
             elementFactory.createType(element, resolveResult.substitutor)
         } else {
             val resolvedClass = expectedClassType.resolve()
-                ?: return InspectionGadgetsFix.EMPTY_ARRAY
+                ?: return LocalQuickFix.EMPTY_ARRAY
             elementFactory.createType(resolvedClass)
         }
 
