⁠
llamalad7: Feature/method signature intersection (#2647 )
* Refactor: Rework expected MethodSignatures.
- ParameterGroups are gone, with every signature now effectively containing a required leading group and an optional vararg trailing group. The prior flexibility made working them easy to get wrong, for example in the matching logic which would have been incorrect for leading vararg groups.
- Inject previously contained 2 optional groups (the target's params and the captured locals) but this was in fact incorrect, since the captured params are required if we want to capture any locals, so it is now (better) represented as 2 separate signature options.
- The distinction between `WARN_IF_ABSENT` and `ERROR_IF_ABSENT` is entirely removed. It was effectively unused since it only applied to captured Inject locals, which are varargs and therefore never "absent" (a separate inspection handles unused LocalCapture).
- ModifyArgs is in fact all-or-nothing wrt capturing the target parameters, and this is now reflected.
* Fix: Disallow non-int int-like types in @ModifyConstant.
Not sure why these are there, Mixin doesn't allow them.
* Fix: Disallow `nullValue` in `@ModifyConstant`.
It does not work and cannot ever work.
* stash
* stash
* finish general intersection
* cleanup
* stash
* stash
* fix general intersection
* stash
* fix tests
* return type only suggestions
* prioritise existing return type in modifier suggestions
* restore BeforeConstant's behaviour of ensuring only 1 discriminator is specified, and supporting wildcard matches
* Fix: Support `.class` constants in `@ModifyConstant`.
* Switch `@ModifyConstant` to a general signature type.
* int coercion kinda fixed ish
* fix int coercion properly
* cleanup
* proper int-like logic
* cleanup
* some docs and fixes
* fix return type solving
* Cache walked supertypes and improve handling of Object as a supertype.
* Cleanup
* Cleanup
* Small fixes
* Small fixes
* Fix: Suggest "ci" for coerced callba...
* Refactor: Rework expected MethodSignatures.
- ParameterGroups are gone, with every signature now effectively containing a required leading group and an optional vararg trailing group. The prior flexibility made working them easy to get wrong, for example in the matching logic which would have been incorrect for leading vararg groups.
- Inject previously contained 2 optional groups (the target's params and the captured locals) but this was in fact incorrect, since the captured params are required if we want to capture any locals, so it is now (better) represented as 2 separate signature options.
- The distinction between `WARN_IF_ABSENT` and `ERROR_IF_ABSENT` is entirely removed. It was effectively unused since it only applied to captured Inject locals, which are varargs and therefore never "absent" (a separate inspection handles unused LocalCapture).
- ModifyArgs is in fact all-or-nothing wrt capturing the target parameters, and this is now reflected.
* Fix: Disallow non-int int-like types in @ModifyConstant.
Not sure why these are there, Mixin doesn't allow them.
* Fix: Disallow `nullValue` in `@ModifyConstant`.
It does not work and cannot ever work.
* stash
* stash
* finish general intersection
* cleanup
* stash
* stash
* fix general intersection
* stash
* fix tests
* return type only suggestions
* prioritise existing return type in modifier suggestions
* restore BeforeConstant's behaviour of ensuring only 1 discriminator is specified, and supporting wildcard matches
* Fix: Support `.class` constants in `@ModifyConstant`.
* Switch `@ModifyConstant` to a general signature type.
* int coercion kinda fixed ish
* fix int coercion properly
* cleanup
* proper int-like logic
* cleanup
* some docs and fixes
* fix return type solving
* Cache walked supertypes and improve handling of Object as a supertype.
* Cleanup
* Cleanup
* Small fixes
* Small fixes
* Fix: Suggest "ci" for coerced callba...
- /*
- * 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.util
-
- import com.intellij.psi.PsiType
- import com.intellij.psi.PsiTypes
- import java.util.EnumSet
-
- /**
- * Represents a constraint solver for the anchor type of a signature containing free int-like types.
- */
- class IntLikeAnchorSolver {
- private val candidates = EnumSet.allOf(IntType::class.java)
- private var hasIntPreference = false
- private var hasLeafPreference = false
-
- /**
- * Adds the given constraint to the solver and returns whether a solution is still possible.
- */
- fun constrain(desiredType: PsiType, isAnchor: Boolean, isHard: Boolean): Boolean {
- val type = IntType.of(desiredType) ?: return false
- when {
- isHard && (isAnchor || type == IntType.INT) -> candidates.retainAll(EnumSet.of(type))
- type == IntType.INT -> hasIntPreference = true
- isAnchor -> candidates.retainAll(EnumSet.of(type))
- else -> {
- candidates.retainAll(EnumSet.of(type, IntType.INT))
- hasLeafPreference = true
- }
- }
- return candidates.isNotEmpty()
- }
-
- /**
- * Returns either a chosen anchor type or `null` if any anchor type will suffice.
- *
- * **Precondition:** A solution is possible.
- */
- fun solve(): PsiType? {
- require(candidates.isNotEmpty())
-
- candidates.singleOrNull()?.let { return it.type }
-
- return when {
- // int preference is the strongest, since choosing a leaf type instead would require a @Coerce *and* the
- // use of an undesired leaf type
- hasIntPreference -> {
- // Cannot have 2 leaves without int
- check(IntType.INT in candidates)
- PsiTypes.intType()
- }
- // Leaf preference is the next strongest, since choosing int instead would require a @Coerce
- // NB leaf preferences can only come from non-anchor positions
- hasLeafPreference -> {
- // Cannot have 2 leaves and a leaf preference
- candidates.single { it != IntType.INT }.type
- }
- else -> {
- // We have multiple options and no preference at all
- check(candidates.size == IntType.entries.size)
- null
- }
- }
- }
- }
-
- private enum class IntType(val type: PsiType) {
- INT(PsiTypes.intType()),
- BYTE(PsiTypes.byteType()),
- SHORT(PsiTypes.shortType()),
- CHAR(PsiTypes.charType()),
- BOOLEAN(PsiTypes.booleanType());
-
- companion object {
- private val lookup = entries.associateBy { it.type }
-
- fun of(type: PsiType) = lookup[type]
- }
- }