⁠
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]>
* 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]>
- /*
- * 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.action
-
- import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.QualifiedMember
- import com.demonwav.mcdev.platform.mixin.reference.toMixinString
- import com.demonwav.mcdev.util.findReferencedMember
- import com.demonwav.mcdev.util.getQualifiedMemberReference
- import com.demonwav.mcdev.util.qualifiedMemberReference
- import com.intellij.openapi.actionSystem.AnAction
- import com.intellij.openapi.actionSystem.AnActionEvent
- import com.intellij.openapi.actionSystem.CommonDataKeys.CARET
- import com.intellij.openapi.actionSystem.CommonDataKeys.PSI_FILE
- import com.intellij.openapi.ide.CopyPasteManager
- import com.intellij.openapi.wm.WindowManager
- import com.intellij.psi.PsiField
- import com.intellij.psi.PsiMethod
- import com.intellij.psi.PsiQualifiedReference
- import java.awt.datatransfer.StringSelection
-
- class CopyMixinTargetReferenceAction : AnAction() {
-
- override fun actionPerformed(e: AnActionEvent) {
- val project = e.project ?: return
- val file = e.getData(PSI_FILE) ?: return
- val caret = e.getData(CARET) ?: return
-
- val element = file.findElementAt(caret.offset) ?: return
- val member = element.findReferencedMember() ?: return
- val targetClass = (element.parent as? PsiQualifiedReference)?.let { QualifiedMember.resolveQualifier(it) }
-
- val targetReference = when (member) {
- is PsiMethod -> if (targetClass != null) {
- member.getQualifiedMemberReference(targetClass)
- } else {
- member.qualifiedMemberReference
- }
- is PsiField -> if (targetClass != null) {
- member.getQualifiedMemberReference(targetClass)
- } else {
- member.qualifiedMemberReference
- }
- else -> return
- }
-
- CopyPasteManager.getInstance().setContents(StringSelection(targetReference.toMixinString()))
- WindowManager.getInstance().getStatusBar(project).info = "Mixin target reference has been copied."
- }
- }
- /*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2026 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.action
-
- import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.QualifiedMember
- import com.demonwav.mcdev.util.findReferencedMember
- import com.demonwav.mcdev.util.getQualifiedMemberReference
- import com.demonwav.mcdev.util.qualifiedMemberReference
- import com.intellij.openapi.actionSystem.AnAction
- import com.intellij.openapi.actionSystem.AnActionEvent
- import com.intellij.openapi.actionSystem.CommonDataKeys.CARET
- import com.intellij.openapi.actionSystem.CommonDataKeys.PSI_FILE
- import com.intellij.openapi.ide.CopyPasteManager
- import com.intellij.openapi.wm.WindowManager
- import com.intellij.psi.PsiField
- import com.intellij.psi.PsiMethod
- import com.intellij.psi.PsiQualifiedReference
- import java.awt.datatransfer.StringSelection
-
- class CopyMixinTargetReferenceAction : AnAction() {
-
- override fun actionPerformed(e: AnActionEvent) {
- val project = e.project ?: return
- val file = e.getData(PSI_FILE) ?: return
- val caret = e.getData(CARET) ?: return
-
- val element = file.findElementAt(caret.offset) ?: return
- val member = element.findReferencedMember() ?: return
- val targetClass = (element.parent as? PsiQualifiedReference)?.let { QualifiedMember.resolveQualifier(it) }
-
- val targetReference = when (member) {
- is PsiMethod -> if (targetClass != null) {
- member.getQualifiedMemberReference(targetClass)
- } else {
- member.qualifiedMemberReference
- }
- is PsiField -> if (targetClass != null) {
- member.getQualifiedMemberReference(targetClass)
- } else {
- member.qualifiedMemberReference
- }
- else -> return
- }
-
- CopyPasteManager.getInstance().setContents(StringSelection(targetReference.toMixinString()))
- WindowManager.getInstance().getStatusBar(project).info = "Mixin target reference has been copied."
- }
- }