Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/expressions int like types #2261

Merged
merged 3 commits into from
Mar 10, 2024
Merged

Fix/expressions int like types #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a631c01
Mixin: Combine parameter and return type inspections.
LlamaLad7 Mar 10, 2024
ae8420b
MixinExtras: Offer a choice between all valid int-like types.
LlamaLad7 Mar 10, 2024
ca2c0d4
Mixin: Fix tests for handler signature inspection.
LlamaLad7 Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 74 additions & 12 deletions src/main/kotlin/platform/mixin/handlers/mixinextras/MixinExtrasInjectorAnnotationHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ abstract class MixinExtrasInjectorAnnotationHandler : InjectorAnnotationHandler(
target: TargetInsn,
): Pair<ParameterGroup, PsiType>?

open fun intLikeTypePositions(
target: TargetInsn
): List<MethodSignature.TypePosition> = emptyList()

override val allowCoerce = true

override fun expectedMethodSignature(
Expand All @@ -115,21 +119,75 @@ abstract class MixinExtrasInjectorAnnotationHandler : InjectorAnnotationHandler(
}
val firstMatch = signatures[0] ?: return emptyList()
if (signatures.drop(1).any { it != firstMatch }) return emptyList()
return listOf(
MethodSignature(
listOf(
firstMatch.first,
ParameterGroup(
collectTargetMethodParameters(annotation.project, targetClass, targetMethod),
required = ParameterGroup.RequiredLevel.OPTIONAL,
isVarargs = true,
),
),
firstMatch.second
)
val intLikeTypePositions = insns.map { intLikeTypePositions(it) }.distinct().singleOrNull().orEmpty()
return allPossibleSignatures(
annotation,
targetClass,
targetMethod,
firstMatch.first,
firstMatch.second,
intLikeTypePositions
)
}

private fun allPossibleSignatures(
annotation: PsiAnnotation,
targetClass: ClassNode,
targetMethod: MethodNode,
params: ParameterGroup,
returnType: PsiType,
intLikeTypePositions: List<MethodSignature.TypePosition>
): List<MethodSignature> {
if (intLikeTypePositions.isEmpty()) {
return listOf(
makeSignature(annotation, targetClass, targetMethod, params, returnType, intLikeTypePositions)
)
}
return buildList {
for (actualType in intLikePsiTypes) {
val newParams = params.parameters.toMutableList()
var newReturnType = returnType
for (pos in intLikeTypePositions) {
when (pos) {
is MethodSignature.TypePosition.Return -> newReturnType = actualType
is MethodSignature.TypePosition.Param ->
newParams[pos.index] = newParams[pos.index].copy(type = actualType)
}
}
add(
makeSignature(
annotation,
targetClass,
targetMethod,
ParameterGroup(newParams),
newReturnType,
intLikeTypePositions
)
)
}
}
}

private fun makeSignature(
annotation: PsiAnnotation,
targetClass: ClassNode,
targetMethod: MethodNode,
params: ParameterGroup,
returnType: PsiType,
intLikeTypePositions: List<MethodSignature.TypePosition>
) = MethodSignature(
listOf(
params,
ParameterGroup(
collectTargetMethodParameters(annotation.project, targetClass, targetMethod),
required = ParameterGroup.RequiredLevel.OPTIONAL,
isVarargs = true,
),
),
returnType,
intLikeTypePositions
)

protected fun getInsnReturnType(insn: AbstractInsnNode): Type? {
return when {
insn is MethodInsnNode -> Type.getReturnType(insn.desc)
Expand Down Expand Up @@ -365,3 +423,7 @@ private fun getConstantType(insn: AbstractInsnNode?): Type? {
}
}
}

private val intLikePsiTypes = listOf(
PsiTypes.intType(), PsiTypes.booleanType(), PsiTypes.charType(), PsiTypes.byteType(), PsiTypes.shortType()
)
10 changes: 10 additions & 0 deletions src/main/kotlin/platform/mixin/handlers/mixinextras/ModifyExpressionValueHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@

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

import com.demonwav.mcdev.platform.mixin.inspection.injector.MethodSignature
import com.demonwav.mcdev.platform.mixin.inspection.injector.ParameterGroup
import com.demonwav.mcdev.platform.mixin.util.toPsiType
import com.demonwav.mcdev.util.Parameter
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiType
import com.llamalad7.mixinextras.utils.Decorations
import com.llamalad7.mixinextras.utils.TypeUtils
import org.objectweb.asm.Type
import org.objectweb.asm.tree.AbstractInsnNode
import org.objectweb.asm.tree.ClassNode
Expand All @@ -53,6 +55,14 @@ class ModifyExpressionValueHandler : MixinExtrasInjectorAnnotationHandler() {
return ParameterGroup(listOf(Parameter("original", psiType))) to psiType
}

override fun intLikeTypePositions(target: TargetInsn): List<MethodSignature.TypePosition> {
val expressionType = target.getDecoration<Type>(Decorations.SIMPLE_EXPRESSION_TYPE)
if (expressionType == TypeUtils.INTLIKE_TYPE) {
return listOf(MethodSignature.TypePosition.Return, MethodSignature.TypePosition.Param(0))
}
return emptyList()
}

private fun getReturnType(
target: TargetInsn,
annotation: PsiAnnotation
Expand Down
13 changes: 13 additions & 0 deletions src/main/kotlin/platform/mixin/handlers/mixinextras/WrapOperationHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

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

import com.demonwav.mcdev.platform.mixin.inspection.injector.MethodSignature
import com.demonwav.mcdev.platform.mixin.inspection.injector.ParameterGroup
import com.demonwav.mcdev.platform.mixin.util.MixinConstants.MixinExtras.OPERATION
import com.demonwav.mcdev.platform.mixin.util.toPsiType
Expand All @@ -30,6 +31,7 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiPrimitiveType
import com.intellij.psi.PsiType
import com.llamalad7.mixinextras.utils.Decorations
import com.llamalad7.mixinextras.utils.TypeUtils
import org.objectweb.asm.Type
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.MethodNode
Expand Down Expand Up @@ -58,6 +60,17 @@ class WrapOperationHandler : MixinExtrasInjectorAnnotationHandler() {
) to returnType
}

override fun intLikeTypePositions(target: TargetInsn) = buildList {
if (target.getDecoration<Type>(Decorations.SIMPLE_OPERATION_RETURN_TYPE) == TypeUtils.INTLIKE_TYPE) {
add(MethodSignature.TypePosition.Return)
}
target.getDecoration<Array<Type>>(Decorations.SIMPLE_OPERATION_ARGS)?.forEachIndexed { i, it ->
if (it == TypeUtils.INTLIKE_TYPE) {
add(MethodSignature.TypePosition.Param(i))
}
}
}

private fun getParameterTypes(
target: TargetInsn,
targetClass: ClassNode,
Expand Down
Loading
Loading