⁠
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
-
- import com.demonwav.mcdev.framework.EdtInterceptor
- import com.demonwav.mcdev.platform.mixin.inspection.reference.AmbiguousReferenceInspection
- import org.intellij.lang.annotations.Language
- import org.junit.jupiter.api.DisplayName
- import org.junit.jupiter.api.Test
- import org.junit.jupiter.api.extension.ExtendWith
-
- @ExtendWith(EdtInterceptor::class)
- @DisplayName("Ambiguous Reference Inspection Tests")
- class AmbiguousReferenceInspectionTest : BaseMixinTest() {
-
- private fun doTest(@Language("JAVA") code: String) {
- buildProject {
- dir("test") {
- java("AmbiguousReferenceMixin.java", code)
- }
- }
-
- fixture.enableInspections(AmbiguousReferenceInspection::class)
- fixture.checkHighlighting(true, false, false)
- }
-
- @Test
- @DisplayName("Ambiguous Reference")
- fun ambiguousReference() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = <warning descr="Ambiguous reference to method 'method' in target class">"method"</warning>, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Reference")
- fun noAmbiguousReference() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = "uniqueMethod", at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("Ambiguous Reference Multiple Targets")
- fun ambiguousReferenceMultipleTargets() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {<warning descr="Ambiguous reference to method 'method' in target class">"method"</warning>, "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Qualified Reference")
- fun noAmbiguousQualifiedReference() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = "method(Ljava/lang/String;)V", at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Reference Multiple Targets")
- fun noAmbiguousReferenceMultipleTargets() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {"method(Ljava/lang/String;)V", "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
- }
- /*
- * 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
-
- import com.demonwav.mcdev.framework.EdtInterceptor
- import com.demonwav.mcdev.platform.mixin.inspection.reference.AmbiguousReferenceInspection
- import org.intellij.lang.annotations.Language
- import org.junit.jupiter.api.DisplayName
- import org.junit.jupiter.api.Test
- import org.junit.jupiter.api.extension.ExtendWith
-
- @ExtendWith(EdtInterceptor::class)
- @DisplayName("Ambiguous Reference Inspection Tests")
- class AmbiguousReferenceInspectionTest : BaseMixinTest() {
-
- private fun doTest(@Language("JAVA") code: String) {
- buildProject {
- dir("test") {
- java("AmbiguousReferenceMixin.java", code)
- }
- }
-
- fixture.enableInspections(AmbiguousReferenceInspection::class)
- fixture.checkHighlighting(true, false, false)
- }
-
- @Test
- @DisplayName("Ambiguous Reference")
- fun ambiguousReference() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = <warning descr="Ambiguous reference to method in target class">"method"</warning>, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Reference")
- fun noAmbiguousReference() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = "uniqueMethod", at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("Ambiguous Reference Multiple Targets")
- fun ambiguousReferenceMultipleTargets() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {<warning descr="Ambiguous reference to method in target class">"method"</warning>, "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Qualified Reference")
- fun noAmbiguousQualifiedReference() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = "method(Ljava/lang/String;)V", at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Reference Multiple Targets")
- fun noAmbiguousReferenceMultipleTargets() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {"method(Ljava/lang/String;)V", "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("Explicit single quantifier")
- fun explicitSingleQuantifier() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {"method{1}", "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("Ambiguous Reference Desc")
- fun ambiguousReferenceDesc() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {<warning descr="Ambiguous reference to method in target class">"()V"</warning>, "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
-
- @Test
- @DisplayName("No Ambiguous Reference Desc")
- fun noAmbiguousReferenceDesc() {
- doTest(
- """
- package test;
-
- import com.demonwav.mcdev.mixintestdata.ambiguousReference.MixedIn;
- import org.spongepowered.asm.mixin.Mixin;
- import org.spongepowered.asm.mixin.injection.At;
- import org.spongepowered.asm.mixin.injection.Inject;
-
- @Mixin(MixedIn.class)
- class AmbiguousReferenceMixin {
-
- @Inject(method = {"(I)V", "uniqueMethod"}, at = @At("HEAD"))
- public void onMethod() {
- }
- }
- """,
- )
- }
- }