src/main/kotlin/platform/mixin/handlers/MixinMemberAnnotationHandler.kt diff

← → edited src/main/kotlin/platform/mixin/handlers/MixinMemberAnnotationHandler.kt

Ignore whitespaces Open in IDE

⁠ llamalad7: Feature/mixin quantifiers (#2643 )

* Refactor: Split MemberInfo and MemberReference.

Mixin MemberInfo strings are only tangentially related to concrete MemberReferences. We also introduce a MemberMatcher superinterface for resolving things.

* Refactor: Parse MemberInfos properly and represent Quantifiers.

* Fix: Handle all cases properly in AmbiguousReferenceInspection.

Really nothing is "ambiguous" (except perhaps to the reader), it's just that Mixin's default behaviour of matching the first method in a given class is unexpected, but I'll leave the terminology for now. Adding any explicit quantifier suppresses this inspection, including `{1}` if that's really what's desired.

Additionally, adding a wildcard is almost never the correct fix. Choosing one of the available descriptors is what should be offered instead, but I'll leave that too for now.

* New: Handle maximum values in quantifiers.

* Fix: Fix incorrect filter stats emptiness check.

Causes targets not to show as unresolved when they should.

* New: Handle minimum values in quantifiers.

* Fix: Account for individual Mixin `method` strings contributing multiple methods.

* Fix: Don't report injector signature issues in methods where we find no targets.

* Move insn resolution failure message to field in failure class, and add message for min quantifier not satisfied

---------

Co-authored-by: joe <[email protected]>

Copy Copy

/*
* Minecraft Development for IntelliJ
*
* https://mcdev.io/
*
* Copyright (C) 2025 minecraft-dev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, version 3.0 only.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package com.demonwav.mcdev.platform.mixin.handlers

import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiElement
import org.objectweb.asm.tree.ClassNode

interface MixinMemberAnnotationHandler : MixinAnnotationHandler {
override fun isUnresolved(annotation: PsiAnnotation, targetClass: ClassNode): InsnResolutionInfo.Failure? {
return if (resolveTarget(annotation, targetClass).isEmpty()) {
InsnResolutionInfo.Failure()
} else {
null
}
}

override fun resolveForNavigation(annotation: PsiAnnotation, targetClass: ClassNode): List<PsiElement> {
val project = annotation.project
val targets = resolveTarget(annotation, targetClass)
return targets.mapNotNull { it.findSourceElement(project, annotation.resolveScope, canDecompile = true) }
}
}

/*
* Minecraft Development for IntelliJ
*
* https://mcdev.io/
*
* Copyright (C) 2025 minecraft-dev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, version 3.0 only.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package com.demonwav.mcdev.platform.mixin.handlers

import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiElement
import org.objectweb.asm.tree.ClassNode

interface MixinMemberAnnotationHandler : MixinAnnotationHandler {
override fun isUnresolved(annotation: PsiAnnotation, targetClass: ClassNode): InsnResolutionInfo.Failure? {
return if (resolveTarget(annotation, targetClass).isEmpty()) {
createUnresolvedMessage(annotation)?.let(InsnResolutionInfo<Nothing>::Failure)
} else {
null
}
}

override fun resolveForNavigation(annotation: PsiAnnotation, targetClass: ClassNode): List<PsiElement> {
val project = annotation.project
val targets = resolveTarget(annotation, targetClass)
return targets.mapNotNull { it.findSourceElement(project, annotation.resolveScope, canDecompile = true) }
}

fun createUnresolvedMessage(annotation: PsiAnnotation): String?
}

/* * Minecraft Development for IntelliJ * * https://mcdev.io/ * * Copyright (C) 2025 minecraft-dev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published * by the Free Software Foundation, version 3.0 only. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package com.demonwav.mcdev.platform.mixin.handlers import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiElement import org.objectweb.asm.tree.ClassNode interface MixinMemberAnnotationHandler : MixinAnnotationHandler { override fun isUnresolved(annotation: PsiAnnotation, targetClass: ClassNode): InsnResolutionInfo.Failure? { return if (resolveTarget(annotation, targetClass).isEmpty()) { InsnResolutionInfo.Failure() } else { null } } override fun resolveForNavigation(annotation: PsiAnnotation, targetClass: ClassNode): List<PsiElement> { val project = annotation.project val targets = resolveTarget(annotation, targetClass) return targets.mapNotNull { it.findSourceElement(project, annotation.resolveScope, canDecompile = true) } } } /* * Minecraft Development for IntelliJ * * https://mcdev.io/ * * Copyright (C) 2025 minecraft-dev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published * by the Free Software Foundation, version 3.0 only. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package com.demonwav.mcdev.platform.mixin.handlers import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiElement import org.objectweb.asm.tree.ClassNode interface MixinMemberAnnotationHandler : MixinAnnotationHandler { override fun isUnresolved(annotation: PsiAnnotation, targetClass: ClassNode): InsnResolutionInfo.Failure? { return if (resolveTarget(annotation, targetClass).isEmpty()) { createUnresolvedMessage(annotation)?.let(InsnResolutionInfo<Nothing>::Failure) } else { null } } override fun resolveForNavigation(annotation: PsiAnnotation, targetClass: ClassNode): List<PsiElement> { val project = annotation.project val targets = resolveTarget(annotation, targetClass) return targets.mapNotNull { it.findSourceElement(project, annotation.resolveScope, canDecompile = true) } } fun createUnresolvedMessage(annotation: PsiAnnotation): String? }

Add build comment

Mute test

Server communication failure

Run custom build

TODO

Responsibility

Edit tags

Loading...

Are you sure?