src/main/kotlin/platform/mixin/handlers/InjectAnnotationHandler.kt diff

← → edited src/main/kotlin/platform/mixin/handlers/InjectAnnotationHandler.kt

Ignore whitespaces Open in IDE

⁠ rednesto: Fix #2308 Mixin Inject signature fix adds last parameter as first local

Copy Copy

/*
* Minecraft Development for IntelliJ
*
* https://mcdev.io/
*
* Copyright (C) 2024 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.handlers

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.LocalVariables
import com.demonwav.mcdev.platform.mixin.util.callbackInfoReturnableType
import com.demonwav.mcdev.platform.mixin.util.callbackInfoType
import com.demonwav.mcdev.platform.mixin.util.getGenericReturnType
import com.demonwav.mcdev.platform.mixin.util.hasAccess
import com.demonwav.mcdev.platform.mixin.util.toPsiType
import com.demonwav.mcdev.util.Parameter
import com.demonwav.mcdev.util.findModule
import com.demonwav.mcdev.util.firstIndexOrNull
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiQualifiedReference
import com.intellij.psi.PsiTypes
import com.intellij.psi.util.parentOfType
import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext
import org.objectweb.asm.Opcodes
import org.objectweb.asm.Type
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.MethodNode

class InjectAnnotationHandler : InjectorAnnotationHandler() {
override fun expectedMethodSignature(
annotation: PsiAnnotation,
targetClass: ClassNode,
targetMethod: MethodNode,
): List<MethodSignature> {
val returnType = targetMethod.getGenericReturnType(targetClass, annotation.project)

val result = ArrayList<ParameterGroup>()

// Parameters from injected method (optional)
result.add(
ParameterGroup(
collectTargetMethodParameters(annotation.project, targetClass, targetMethod),
required = ParameterGroup.RequiredLevel.OPTIONAL,
default = true,
),
)

// Callback info (required)
result.add(
ParameterGroup(
listOf(
if (returnType == PsiTypes.voidType()) {
Parameter("ci", callbackInfoType(annotation.project))
} else {
Parameter(
"cir",
callbackInfoReturnableType(annotation.project, annotation, returnType)!!,
)
},
),
),
)

// Captured locals (only if local capture is enabled)
val localCapture = (annotation.findDeclaredAttributeValue("locals") as? PsiQualifiedReference)
?.referenceName ?: "NO_CAPTURE"
if (localCapture != "NO_CAPTURE") {
annotation.findModule()?.let { module ->
var commonLocalsPrefix: MutableList<LocalVariables.LocalVariable>? = null
val resolvedInsns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return@let }
for (insn in resolvedInsns) {
val locals = LocalVariables.getLocals(module, targetClass, targetMethod, insn.insn)
?.drop(
Type.getArgumentTypes(targetMethod.desc).size +
if (targetMethod.hasAccess(Opcodes.ACC_STATIC)) 0 else 1,
)
?.filterNotNull()
?.filter { it.desc != null }
?: continue
if (commonLocalsPrefix == null) {
commonLocalsPrefix = locals.toMutableList()
} else {
val mismatch = commonLocalsPrefix.zip(locals).firstIndexOrNull { (a, b) -> a.desc != b.desc }
if (mismatch != null) {
commonLocalsPrefix.subList(mismatch, commonLocalsPrefix.size).clear()
}
}
}

if (commonLocalsPrefix != null) {
val elementFactory = JavaPsiFacade.getElementFactory(annotation.project)
val localParams = commonLocalsPrefix.map { local ->
val type =
Type.getType(local.desc).toPsiType(elementFactory, annotation.parentOfType<PsiMethod>())
sanitizedParameter(type, local.name)
}
val requiredLevel = if (localCapture == "CAPTURE_FAILSOFT") {
ParameterGroup.RequiredLevel.WARN_IF_ABSENT
} else {
ParameterGroup.RequiredLevel.ERROR_IF_ABSENT
}
result.add(
ParameterGroup(
localParams,
default = true,
required = requiredLevel,
isVarargs = true,
),
)
}
}
}

return listOf(MethodSignature(result, PsiTypes.voidType()))
}

override val allowCoerce = true

override val mixinExtrasExpressionContextType = ExpressionContext.Type.INJECT
}

/*
* Minecraft Development for IntelliJ
*
* https://mcdev.io/
*
* Copyright (C) 2024 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.handlers

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.LocalVariables
import com.demonwav.mcdev.platform.mixin.util.callbackInfoReturnableType
import com.demonwav.mcdev.platform.mixin.util.callbackInfoType
import com.demonwav.mcdev.platform.mixin.util.getGenericReturnType
import com.demonwav.mcdev.platform.mixin.util.hasAccess
import com.demonwav.mcdev.platform.mixin.util.toPsiType
import com.demonwav.mcdev.util.Parameter
import com.demonwav.mcdev.util.findModule
import com.demonwav.mcdev.util.firstIndexOrNull
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiQualifiedReference
import com.intellij.psi.PsiTypes
import com.intellij.psi.util.parentOfType
import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext
import org.objectweb.asm.Opcodes
import org.objectweb.asm.Type
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.MethodNode

class InjectAnnotationHandler : InjectorAnnotationHandler() {
override fun expectedMethodSignature(
annotation: PsiAnnotation,
targetClass: ClassNode,
targetMethod: MethodNode,
): List<MethodSignature> {
val returnType = targetMethod.getGenericReturnType(targetClass, annotation.project)

val result = ArrayList<ParameterGroup>()

// Parameters from injected method (optional)
result.add(
ParameterGroup(
collectTargetMethodParameters(annotation.project, targetClass, targetMethod),
required = ParameterGroup.RequiredLevel.OPTIONAL,
default = true,
),
)

// Callback info (required)
result.add(
ParameterGroup(
listOf(
if (returnType == PsiTypes.voidType()) {
Parameter("ci", callbackInfoType(annotation.project))
} else {
Parameter(
"cir",
callbackInfoReturnableType(annotation.project, annotation, returnType)!!,
)
},
),
),
)

// Captured locals (only if local capture is enabled)
val localCapture = (annotation.findDeclaredAttributeValue("locals") as? PsiQualifiedReference)
?.referenceName ?: "NO_CAPTURE"
if (localCapture != "NO_CAPTURE") {
annotation.findModule()?.let { module ->
var commonLocalsPrefix: MutableList<LocalVariables.LocalVariable>? = null
val resolvedInsns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return@let }
for (insn in resolvedInsns) {
val locals = LocalVariables.getLocals(module, targetClass, targetMethod, insn.insn)
?.filterNotNull()
?.drop(
Type.getArgumentTypes(targetMethod.desc).size +
if (targetMethod.hasAccess(Opcodes.ACC_STATIC)) 0 else 1,
)
?.filter { it.desc != null }
?: continue
if (commonLocalsPrefix == null) {
commonLocalsPrefix = locals.toMutableList()
} else {
val mismatch = commonLocalsPrefix.zip(locals).firstIndexOrNull { (a, b) -> a.desc != b.desc }
if (mismatch != null) {
commonLocalsPrefix.subList(mismatch, commonLocalsPrefix.size).clear()
}
}
}

if (commonLocalsPrefix != null) {
val elementFactory = JavaPsiFacade.getElementFactory(annotation.project)
val localParams = commonLocalsPrefix.map { local ->
val type =
Type.getType(local.desc).toPsiType(elementFactory, annotation.parentOfType<PsiMethod>())
sanitizedParameter(type, local.name)
}
val requiredLevel = if (localCapture == "CAPTURE_FAILSOFT") {
ParameterGroup.RequiredLevel.WARN_IF_ABSENT
} else {
ParameterGroup.RequiredLevel.ERROR_IF_ABSENT
}
result.add(
ParameterGroup(
localParams,
default = true,
required = requiredLevel,
isVarargs = true,
),
)
}
}
}

return listOf(MethodSignature(result, PsiTypes.voidType()))
}

override val allowCoerce = true

override val mixinExtrasExpressionContextType = ExpressionContext.Type.INJECT
}

/* * Minecraft Development for IntelliJ * * https://mcdev.io/ * * Copyright (C) 2024 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.handlers 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.LocalVariables import com.demonwav.mcdev.platform.mixin.util.callbackInfoReturnableType import com.demonwav.mcdev.platform.mixin.util.callbackInfoType import com.demonwav.mcdev.platform.mixin.util.getGenericReturnType import com.demonwav.mcdev.platform.mixin.util.hasAccess import com.demonwav.mcdev.platform.mixin.util.toPsiType import com.demonwav.mcdev.util.Parameter import com.demonwav.mcdev.util.findModule import com.demonwav.mcdev.util.firstIndexOrNull import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiMethod import com.intellij.psi.PsiQualifiedReference import com.intellij.psi.PsiTypes import com.intellij.psi.util.parentOfType import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext import org.objectweb.asm.Opcodes import org.objectweb.asm.Type import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.MethodNode class InjectAnnotationHandler : InjectorAnnotationHandler() { override fun expectedMethodSignature( annotation: PsiAnnotation, targetClass: ClassNode, targetMethod: MethodNode, ): List<MethodSignature> { val returnType = targetMethod.getGenericReturnType(targetClass, annotation.project) val result = ArrayList<ParameterGroup>() // Parameters from injected method (optional) result.add( ParameterGroup( collectTargetMethodParameters(annotation.project, targetClass, targetMethod), required = ParameterGroup.RequiredLevel.OPTIONAL, default = true, ), ) // Callback info (required) result.add( ParameterGroup( listOf( if (returnType == PsiTypes.voidType()) { Parameter("ci", callbackInfoType(annotation.project)) } else { Parameter( "cir", callbackInfoReturnableType(annotation.project, annotation, returnType)!!, ) }, ), ), ) // Captured locals (only if local capture is enabled) val localCapture = (annotation.findDeclaredAttributeValue("locals") as? PsiQualifiedReference) ?.referenceName ?: "NO_CAPTURE" if (localCapture != "NO_CAPTURE") { annotation.findModule()?.let { module -> var commonLocalsPrefix: MutableList<LocalVariables.LocalVariable>? = null val resolvedInsns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return@let } for (insn in resolvedInsns) { val locals = LocalVariables.getLocals(module, targetClass, targetMethod, insn.insn) ?.drop( Type.getArgumentTypes(targetMethod.desc).size + if (targetMethod.hasAccess(Opcodes.ACC_STATIC)) 0 else 1, ) ?.filterNotNull() ?.filter { it.desc != null } ?: continue if (commonLocalsPrefix == null) { commonLocalsPrefix = locals.toMutableList() } else { val mismatch = commonLocalsPrefix.zip(locals).firstIndexOrNull { (a, b) -> a.desc != b.desc } if (mismatch != null) { commonLocalsPrefix.subList(mismatch, commonLocalsPrefix.size).clear() } } } if (commonLocalsPrefix != null) { val elementFactory = JavaPsiFacade.getElementFactory(annotation.project) val localParams = commonLocalsPrefix.map { local -> val type = Type.getType(local.desc).toPsiType(elementFactory, annotation.parentOfType<PsiMethod>()) sanitizedParameter(type, local.name) } val requiredLevel = if (localCapture == "CAPTURE_FAILSOFT") { ParameterGroup.RequiredLevel.WARN_IF_ABSENT } else { ParameterGroup.RequiredLevel.ERROR_IF_ABSENT } result.add( ParameterGroup( localParams, default = true, required = requiredLevel, isVarargs = true, ), ) } } } return listOf(MethodSignature(result, PsiTypes.voidType())) } override val allowCoerce = true override val mixinExtrasExpressionContextType = ExpressionContext.Type.INJECT } /* * Minecraft Development for IntelliJ * * https://mcdev.io/ * * Copyright (C) 2024 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.handlers 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.LocalVariables import com.demonwav.mcdev.platform.mixin.util.callbackInfoReturnableType import com.demonwav.mcdev.platform.mixin.util.callbackInfoType import com.demonwav.mcdev.platform.mixin.util.getGenericReturnType import com.demonwav.mcdev.platform.mixin.util.hasAccess import com.demonwav.mcdev.platform.mixin.util.toPsiType import com.demonwav.mcdev.util.Parameter import com.demonwav.mcdev.util.findModule import com.demonwav.mcdev.util.firstIndexOrNull import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiMethod import com.intellij.psi.PsiQualifiedReference import com.intellij.psi.PsiTypes import com.intellij.psi.util.parentOfType import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext import org.objectweb.asm.Opcodes import org.objectweb.asm.Type import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.MethodNode class InjectAnnotationHandler : InjectorAnnotationHandler() { override fun expectedMethodSignature( annotation: PsiAnnotation, targetClass: ClassNode, targetMethod: MethodNode, ): List<MethodSignature> { val returnType = targetMethod.getGenericReturnType(targetClass, annotation.project) val result = ArrayList<ParameterGroup>() // Parameters from injected method (optional) result.add( ParameterGroup( collectTargetMethodParameters(annotation.project, targetClass, targetMethod), required = ParameterGroup.RequiredLevel.OPTIONAL, default = true, ), ) // Callback info (required) result.add( ParameterGroup( listOf( if (returnType == PsiTypes.voidType()) { Parameter("ci", callbackInfoType(annotation.project)) } else { Parameter( "cir", callbackInfoReturnableType(annotation.project, annotation, returnType)!!, ) }, ), ), ) // Captured locals (only if local capture is enabled) val localCapture = (annotation.findDeclaredAttributeValue("locals") as? PsiQualifiedReference) ?.referenceName ?: "NO_CAPTURE" if (localCapture != "NO_CAPTURE") { annotation.findModule()?.let { module -> var commonLocalsPrefix: MutableList<LocalVariables.LocalVariable>? = null val resolvedInsns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return@let } for (insn in resolvedInsns) { val locals = LocalVariables.getLocals(module, targetClass, targetMethod, insn.insn) ?.filterNotNull() ?.drop( Type.getArgumentTypes(targetMethod.desc).size + if (targetMethod.hasAccess(Opcodes.ACC_STATIC)) 0 else 1, ) ?.filter { it.desc != null } ?: continue if (commonLocalsPrefix == null) { commonLocalsPrefix = locals.toMutableList() } else { val mismatch = commonLocalsPrefix.zip(locals).firstIndexOrNull { (a, b) -> a.desc != b.desc } if (mismatch != null) { commonLocalsPrefix.subList(mismatch, commonLocalsPrefix.size).clear() } } } if (commonLocalsPrefix != null) { val elementFactory = JavaPsiFacade.getElementFactory(annotation.project) val localParams = commonLocalsPrefix.map { local -> val type = Type.getType(local.desc).toPsiType(elementFactory, annotation.parentOfType<PsiMethod>()) sanitizedParameter(type, local.name) } val requiredLevel = if (localCapture == "CAPTURE_FAILSOFT") { ParameterGroup.RequiredLevel.WARN_IF_ABSENT } else { ParameterGroup.RequiredLevel.ERROR_IF_ABSENT } result.add( ParameterGroup( localParams, default = true, required = requiredLevel, isVarargs = true, ), ) } } } return listOf(MethodSignature(result, PsiTypes.voidType())) } override val allowCoerce = true override val mixinExtrasExpressionContextType = ExpressionContext.Type.INJECT }

Add build comment

Mute test

Server communication failure

Run Custom Build

TODO

Responsibility

Edit tags

Loading...

Are you sure?