Skip to content

MixinExtras: Fix incorrect suggested return type for @WrapOperation on field assignments. #2191

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

Merged
merged 1 commit into from
Dec 27, 2023
Merged

MixinExtras: Fix incorrect suggested return type for @WrapOperation on field assignments. #2191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 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 @@ -36,6 +36,7 @@ import com.demonwav.mcdev.util.toJavaIdentifier
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiType
import com.intellij.psi.PsiTypes
import org.objectweb.asm.Opcodes
import org.objectweb.asm.Type
import org.objectweb.asm.tree.AbstractInsnNode
Expand Down Expand Up @@ -153,12 +154,18 @@ abstract class MixinExtrasInjectorAnnotationHandler : InjectorAnnotationHandler(
}

is FieldInsnNode -> {
val sourceClassAndField = (
MemberReference(insn.name, insn.desc, insn.owner.replace('/', '.'))
.resolveAsm(annotation.project) as? FieldTargetMember
)?.classAndField
sourceClassAndField?.field?.getGenericType(sourceClassAndField.clazz, annotation.project)
?: Type.getType(insn.desc).toPsiType(elementFactory)
when (insn.opcode) {
Opcodes.PUTFIELD, Opcodes.PUTSTATIC -> PsiTypes.voidType()
else -> {
val sourceClassAndField = (
MemberReference(insn.name, insn.desc, insn.owner.replace('/', '.'))
.resolveAsm(annotation.project) as? FieldTargetMember
)?.classAndField

sourceClassAndField?.field?.getGenericType(sourceClassAndField.clazz, annotation.project)
?: Type.getType(insn.desc).toPsiType(elementFactory)
}
}
}

else -> getInsnReturnType(insn)?.toPsiType(elementFactory)
Expand Down