User: joe Date: 16 Nov 26 14:38 Revision: 108d68f45ff493303afa9be9187a60d6384c1f0e Summary: Add fine-grained options to InjectorOpcodeInspection TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10811&personal=false Index: src/main/kotlin/platform/mixin/inspection/injector/InjectorOpcodeInspection.kt =================================================================== --- src/main/kotlin/platform/mixin/inspection/injector/InjectorOpcodeInspection.kt (revision f4c65f76b99f3b57d1e119fed498b87be08cc5b7) +++ src/main/kotlin/platform/mixin/inspection/injector/InjectorOpcodeInspection.kt (revision 108d68f45ff493303afa9be9187a60d6384c1f0e) @@ -30,6 +30,7 @@ import com.demonwav.mcdev.util.constantValue import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemsHolder +import com.intellij.codeInspection.options.OptPane import com.intellij.openapi.project.Project import com.intellij.psi.JavaElementVisitor import com.intellij.psi.JavaPsiFacade @@ -38,6 +39,19 @@ import org.objectweb.asm.util.Printer class InjectorOpcodeInspection : MixinInspection() { + @JvmField + var reportIgnored = true + @JvmField + var reportInvalid = true + @JvmField + var reportMissing = true + + override fun getOptionsPane() = OptPane.pane( + OptPane.checkbox("reportIgnored", MCDevBundle("inspection.missing_or_invalid_opcode.option.ignore")), + OptPane.checkbox("reportInvalid", MCDevBundle("inspection.missing_or_invalid_opcode.option.invalid")), + OptPane.checkbox("reportMissing", MCDevBundle("inspection.missing_or_invalid_opcode.option.missing")) + ) + override fun buildVisitor(holder: ProblemsHolder) = object : JavaElementVisitor() { override fun visitAnnotation(annotation: PsiAnnotation) { if (!annotation.hasQualifiedName(MixinConstants.Annotations.AT)) { @@ -50,7 +64,7 @@ val opcode = opcodeAttribute?.constantValue as? Int if (validOpcodes.isEmpty()) { - if (opcode != null) { + if (opcode != null && reportIgnored) { holder.registerProblem( opcodeAttribute, MCDevBundle("inspection.missing_or_invalid_opcode.ignored"), @@ -59,12 +73,14 @@ } } else { if (opcode == null) { + if (reportMissing) { - holder.registerProblem( - annotation.nameReferenceElement ?: annotation, - MCDevBundle("inspection.missing_or_invalid_opcode.missing"), - *listOfNotNull(makeSpecifyOpcodeFix(holder.project, annotation)).toTypedArray() - ) + holder.registerProblem( + annotation.nameReferenceElement ?: annotation, + MCDevBundle("inspection.missing_or_invalid_opcode.missing"), + *listOfNotNull(makeSpecifyOpcodeFix(holder.project, annotation)).toTypedArray() + ) - } else if (opcode !in validOpcodes) { + } + } else if (opcode !in validOpcodes && reportInvalid) { holder.registerProblem( opcodeAttribute, MCDevBundle("inspection.missing_or_invalid_opcode.invalid") Index: src/main/resources/messages/MinecraftDevelopmentBundle.properties =================================================================== --- src/main/resources/messages/MinecraftDevelopmentBundle.properties (revision f4c65f76b99f3b57d1e119fed498b87be08cc5b7) +++ src/main/resources/messages/MinecraftDevelopmentBundle.properties (revision 108d68f45ff493303afa9be9187a60d6384c1f0e) @@ -512,6 +512,9 @@ inspection.missing_or_invalid_opcode.ignored=Opcode is ignored by this injection point inspection.missing_or_invalid_opcode.invalid=Invalid opcode for this injection point inspection.missing_or_invalid_opcode.missing=Missing opcode +inspection.missing_or_invalid_opcode.option.ignore=Report when injector ignores opcodes +inspection.missing_or_invalid_opcode.option.invalid=Report when opcode is invalid for injector +inspection.missing_or_invalid_opcode.option.missing=Report when injector may take an opcode but is missing one inspection.missing_unique.name=Missing @Unique annotation inspection.missing_unique.message=Missing @Unique annotation inspection.mixin_annotation_target.name=Unresolved mixin annotation target