⁠
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.expression
-
- import com.demonwav.mcdev.platform.mixin.util.LocalInfo
- import com.demonwav.mcdev.util.MemberReference
- import com.intellij.openapi.project.Project
- import com.intellij.psi.PsiElement
-
- class MESourceMatchContext(val project: Project) {
- @PublishedApi
- internal var realElement: PsiElement? = null
- private val capturesInternal = mutableListOf<PsiElement>()
- val captures: List<PsiElement> get() = capturesInternal
-
- private val types = mutableMapOf<String, MutableList<String>>()
- private val fields = mutableMapOf<String, MutableList<MemberReference>>()
- private val methods = mutableMapOf<String, MutableList<MemberReference>>()
- private val localInfos = mutableMapOf<String, MutableList<LocalInfo>>()
-
- init {
- addType("byte", "B")
- addType("char", "C")
- addType("double", "D")
- addType("float", "F")
- addType("int", "I")
- addType("long", "J")
- addType("short", "S")
- }
-
- fun addCapture(capturedElement: PsiElement) {
- val element = realElement ?: capturedElement
- capturesInternal += element
- }
-
- fun getTypes(key: String): List<String> = types[key] ?: emptyList()
-
- fun addType(key: String, desc: String) {
- types.getOrPut(key, ::mutableListOf) += desc
- }
-
- fun getFields(key: String): List<MemberReference> = fields[key] ?: emptyList()
-
- fun addField(key: String, field: MemberReference) {
- fields.getOrPut(key, ::mutableListOf) += field
- }
-
- fun getMethods(key: String): List<MemberReference> = methods[key] ?: emptyList()
-
- fun addMethod(key: String, method: MemberReference) {
- methods.getOrPut(key, ::mutableListOf) += method
- }
-
- fun getLocalInfos(key: String): List<LocalInfo> = localInfos[key] ?: emptyList()
-
- fun addLocalInfo(key: String, localInfo: LocalInfo) {
- localInfos.getOrPut(key, ::mutableListOf) += localInfo
- }
-
- fun reset() {
- capturesInternal.clear()
- }
-
- inline fun <T> fakeElementScope(
- isFake: Boolean,
- realElement: PsiElement,
- action: () -> T
- ): T {
- if (this.realElement != null || !isFake) {
- return action()
- }
-
- this.realElement = realElement
- try {
- return action()
- } finally {
- this.realElement = null
- }
- }
- }
- /*
- * 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.expression
-
- import com.demonwav.mcdev.platform.mixin.util.LocalInfo
- import com.demonwav.mcdev.platform.mixin.util.MemberInfo
- import com.intellij.openapi.project.Project
- import com.intellij.psi.PsiElement
-
- class MESourceMatchContext(val project: Project) {
- @PublishedApi
- internal var realElement: PsiElement? = null
- private val capturesInternal = mutableListOf<PsiElement>()
- val captures: List<PsiElement> get() = capturesInternal
-
- private val types = mutableMapOf<String, MutableList<String>>()
- private val fields = mutableMapOf<String, MutableList<MemberInfo>>()
- private val methods = mutableMapOf<String, MutableList<MemberInfo>>()
- private val localInfos = mutableMapOf<String, MutableList<LocalInfo>>()
-
- init {
- addType("byte", "B")
- addType("char", "C")
- addType("double", "D")
- addType("float", "F")
- addType("int", "I")
- addType("long", "J")
- addType("short", "S")
- }
-
- fun addCapture(capturedElement: PsiElement) {
- val element = realElement ?: capturedElement
- capturesInternal += element
- }
-
- fun getTypes(key: String): List<String> = types[key] ?: emptyList()
-
- fun addType(key: String, desc: String) {
- types.getOrPut(key, ::mutableListOf) += desc
- }
-
- fun getFields(key: String): List<MemberInfo> = fields[key] ?: emptyList()
-
- fun addField(key: String, field: MemberInfo) {
- fields.getOrPut(key, ::mutableListOf) += field
- }
-
- fun getMethods(key: String): List<MemberInfo> = methods[key] ?: emptyList()
-
- fun addMethod(key: String, method: MemberInfo) {
- methods.getOrPut(key, ::mutableListOf) += method
- }
-
- fun getLocalInfos(key: String): List<LocalInfo> = localInfos[key] ?: emptyList()
-
- fun addLocalInfo(key: String, localInfo: LocalInfo) {
- localInfos.getOrPut(key, ::mutableListOf) += localInfo
- }
-
- fun reset() {
- capturesInternal.clear()
- }
-
- inline fun <T> fakeElementScope(
- isFake: Boolean,
- realElement: PsiElement,
- action: () -> T
- ): T {
- if (this.realElement != null || !isFake) {
- return action()
- }
-
- this.realElement = realElement
- try {
- return action()
- } finally {
- this.realElement = null
- }
- }
- }