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

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

Ignore whitespaces Open in IDE

⁠ joseph burton: Add support for MixinExtras expressions (#2274 )

* Start on MixinExtras Expression language

* MEExpression color settings page

* MEExpression annotator

* MEExpression brace matcher and quote handler

* Switch LHS of MEExpression assignmentExpression to themselves be certain types of expression

* MEExpression language injection inside @Expression

* Fix formatting and licenses

* Add MIXINEXTRAS:EXPRESSION injection point and add @Expression annotation on completion

* Fix licenser errors

* Add new ME expression features

* Implement MixinExtras expression collect visitor

* Fix cast expressions

* Simple best-effort source matching for ME expressions

* Fix name expression source matching

* Fix MEName.isWildcard

* Fix MELitExpression source matching

* operationSign - operationTokenType

* Add built-in definitions

* Update MixinExtras

* Start with ME definition references

* Attempt to overhaul ME expression injection

* Some fixes to the new injection + navigation

* MixinExtras: Add handler signature support for expressions. (#2244 )

* Partially fix ME definition renaming

* Attempt to get inplace rename refactoring to work (it doesn't)

* MixinExtras: Use expression-suggested parameter names if they're present. (#2257 )

* Fix MEExpressionInjector. Rename refactoring works!

* Suppress deprecation warning

* ME expression `@Definition` find usages

* Fix/expressions int like types (#2261 )

* Mixin: Combine parameter and return type inspections.

* MixinExtras: Offer a choice between all valid int-like types.

* Mixin: Fix tests for handler signature inspection.

* Add simple keyword completion to ME expressions

* Why didn't my local ktlint tell me about these

* Store whether a declaration is a type in the ME PSI

* Add completions for items that already have a definition

* Extract some ME expression matching into its own class, and cache some more things

* Remove some debug...

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.fakeResolve
import com.demonwav.mcdev.platform.mixin.util.getParameter
import com.demonwav.mcdev.platform.mixin.util.toPsiType
import com.demonwav.mcdev.util.constantValue
import com.demonwav.mcdev.util.descriptor
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiMethod
import org.objectweb.asm.Type
import org.objectweb.asm.tree.AbstractInsnNode
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.MethodInsnNode
import org.objectweb.asm.tree.MethodNode

class ModifyArgHandler : InjectorAnnotationHandler() {
override fun isInsnAllowed(insn: AbstractInsnNode): Boolean {
return insn is MethodInsnNode
}

override fun expectedMethodSignature(
annotation: PsiAnnotation,
targetClass: ClassNode,
targetMethod: MethodNode,
): List<MethodSignature>? {
val index = annotation.findDeclaredAttributeValue("index")?.constantValue as? Int
val validSingleArgTypes = mutableSetOf<String>()
var mayHaveValidFullSignature = true
var validFullSignature: String? = null
val insns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return emptyList() }
for (insn in insns) {
if (insn.insn !is MethodInsnNode) return null

// normalize return type so whole signature matches
val desc = insn.insn.desc.replaceAfterLast(')', "V")

if (index == null) {
val validArgTypes = Type.getArgumentTypes(desc).mapTo(mutableListOf()) { it.descriptor }
// remove duplicates completely, they are invalid
val toRemove = validArgTypes.filter { e -> validArgTypes.count { it == e } > 1 }.toSet()
validArgTypes.removeIf { toRemove.contains(it) }
if (validArgTypes.isEmpty()) {
return listOf()
}

if (validSingleArgTypes.isEmpty()) {
validSingleArgTypes.addAll(validArgTypes)
} else {
validSingleArgTypes.retainAll(validArgTypes.toSet())
if (validSingleArgTypes.isEmpty()) {
return listOf()
}
}
} else {
val singleArgType = Type.getArgumentTypes(desc).getOrNull(index)?.descriptor ?: return listOf()
if (validSingleArgTypes.isEmpty()) {
validSingleArgTypes += singleArgType
} else {
validSingleArgTypes.removeIf { it != singleArgType }
if (validSingleArgTypes.isEmpty()) {
return listOf()
}
}
}

if (mayHaveValidFullSignature) {
if (validFullSignature == null) {
validFullSignature = desc
} else {
if (desc != validFullSignature) {
validFullSignature = null
mayHaveValidFullSignature = false
}
}
}
}

// get the source method for parameter names
val (bytecodeClass, bytecodeMethod) = (insns[0].insn as MethodInsnNode).fakeResolve()
val sourceMethod = insns[0].target as? PsiMethod
val elementFactory = JavaPsiFacade.getElementFactory(annotation.project)
return validSingleArgTypes.flatMap { type ->
val paramList = sourceMethod?.parameterList
val psiParameter = paramList?.parameters?.firstOrNull { it.type.descriptor == type }
val psiType = psiParameter?.type ?: Type.getType(type).toPsiType(elementFactory, null)
val singleSignature = MethodSignature(
listOf(
ParameterGroup(
listOf(
sanitizedParameter(psiType, psiParameter?.name),
),
),
),
psiType,
)
if (validFullSignature != null) {
val fullParamGroup = ParameterGroup(
Type.getArgumentTypes(validFullSignature).withIndex().map { (index, argType) ->
val psiParam = paramList?.let { bytecodeMethod.getParameter(bytecodeClass, index, it) }
sanitizedParameter(
psiParam?.type ?: argType.toPsiType(elementFactory),
psiParam?.name,
)
},
)
listOf(
singleSignature,
MethodSignature(listOf(fullParamGroup), psiType),
)
} else {
listOf(singleSignature)
}
}
}
}

/*
* 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.fakeResolve
import com.demonwav.mcdev.platform.mixin.util.getParameter
import com.demonwav.mcdev.platform.mixin.util.toPsiType
import com.demonwav.mcdev.util.constantValue
import com.demonwav.mcdev.util.descriptor
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiMethod
import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext
import org.objectweb.asm.Type
import org.objectweb.asm.tree.AbstractInsnNode
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.MethodInsnNode
import org.objectweb.asm.tree.MethodNode

class ModifyArgHandler : InjectorAnnotationHandler() {
override fun isInsnAllowed(insn: AbstractInsnNode): Boolean {
return insn is MethodInsnNode
}

override fun expectedMethodSignature(
annotation: PsiAnnotation,
targetClass: ClassNode,
targetMethod: MethodNode,
): List<MethodSignature>? {
val index = annotation.findDeclaredAttributeValue("index")?.constantValue as? Int
val validSingleArgTypes = mutableSetOf<String>()
var mayHaveValidFullSignature = true
var validFullSignature: String? = null
val insns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return emptyList() }
for (insn in insns) {
if (insn.insn !is MethodInsnNode) return null

// normalize return type so whole signature matches
val desc = insn.insn.desc.replaceAfterLast(')', "V")

if (index == null) {
val validArgTypes = Type.getArgumentTypes(desc).mapTo(mutableListOf()) { it.descriptor }
// remove duplicates completely, they are invalid
val toRemove = validArgTypes.filter { e -> validArgTypes.count { it == e } > 1 }.toSet()
validArgTypes.removeIf { toRemove.contains(it) }
if (validArgTypes.isEmpty()) {
return listOf()
}

if (validSingleArgTypes.isEmpty()) {
validSingleArgTypes.addAll(validArgTypes)
} else {
validSingleArgTypes.retainAll(validArgTypes.toSet())
if (validSingleArgTypes.isEmpty()) {
return listOf()
}
}
} else {
val singleArgType = Type.getArgumentTypes(desc).getOrNull(index)?.descriptor ?: return listOf()
if (validSingleArgTypes.isEmpty()) {
validSingleArgTypes += singleArgType
} else {
validSingleArgTypes.removeIf { it != singleArgType }
if (validSingleArgTypes.isEmpty()) {
return listOf()
}
}
}

if (mayHaveValidFullSignature) {
if (validFullSignature == null) {
validFullSignature = desc
} else {
if (desc != validFullSignature) {
validFullSignature = null
mayHaveValidFullSignature = false
}
}
}
}

// get the source method for parameter names
val (bytecodeClass, bytecodeMethod) = (insns[0].insn as MethodInsnNode).fakeResolve()
val sourceMethod = insns[0].target as? PsiMethod
val elementFactory = JavaPsiFacade.getElementFactory(annotation.project)
return validSingleArgTypes.flatMap { type ->
val paramList = sourceMethod?.parameterList
val psiParameter = paramList?.parameters?.firstOrNull { it.type.descriptor == type }
val psiType = psiParameter?.type ?: Type.getType(type).toPsiType(elementFactory, null)
val singleSignature = MethodSignature(
listOf(
ParameterGroup(
listOf(
sanitizedParameter(psiType, psiParameter?.name),
),
),
),
psiType,
)
if (validFullSignature != null) {
val fullParamGroup = ParameterGroup(
Type.getArgumentTypes(validFullSignature).withIndex().map { (index, argType) ->
val psiParam = paramList?.let { bytecodeMethod.getParameter(bytecodeClass, index, it) }
sanitizedParameter(
psiParam?.type ?: argType.toPsiType(elementFactory),
psiParam?.name,
)
},
)
listOf(
singleSignature,
MethodSignature(listOf(fullParamGroup), psiType),
)
} else {
listOf(singleSignature)
}
}
}

override val mixinExtrasExpressionContextType = ExpressionContext.Type.MODIFY_ARG
}

/* * 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.fakeResolve import com.demonwav.mcdev.platform.mixin.util.getParameter import com.demonwav.mcdev.platform.mixin.util.toPsiType import com.demonwav.mcdev.util.constantValue import com.demonwav.mcdev.util.descriptor import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiMethod import org.objectweb.asm.Type import org.objectweb.asm.tree.AbstractInsnNode import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.MethodInsnNode import org.objectweb.asm.tree.MethodNode class ModifyArgHandler : InjectorAnnotationHandler() { override fun isInsnAllowed(insn: AbstractInsnNode): Boolean { return insn is MethodInsnNode } override fun expectedMethodSignature( annotation: PsiAnnotation, targetClass: ClassNode, targetMethod: MethodNode, ): List<MethodSignature>? { val index = annotation.findDeclaredAttributeValue("index")?.constantValue as? Int val validSingleArgTypes = mutableSetOf<String>() var mayHaveValidFullSignature = true var validFullSignature: String? = null val insns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return emptyList() } for (insn in insns) { if (insn.insn !is MethodInsnNode) return null // normalize return type so whole signature matches val desc = insn.insn.desc.replaceAfterLast(')', "V") if (index == null) { val validArgTypes = Type.getArgumentTypes(desc).mapTo(mutableListOf()) { it.descriptor } // remove duplicates completely, they are invalid val toRemove = validArgTypes.filter { e -> validArgTypes.count { it == e } > 1 }.toSet() validArgTypes.removeIf { toRemove.contains(it) } if (validArgTypes.isEmpty()) { return listOf() } if (validSingleArgTypes.isEmpty()) { validSingleArgTypes.addAll(validArgTypes) } else { validSingleArgTypes.retainAll(validArgTypes.toSet()) if (validSingleArgTypes.isEmpty()) { return listOf() } } } else { val singleArgType = Type.getArgumentTypes(desc).getOrNull(index)?.descriptor ?: return listOf() if (validSingleArgTypes.isEmpty()) { validSingleArgTypes += singleArgType } else { validSingleArgTypes.removeIf { it != singleArgType } if (validSingleArgTypes.isEmpty()) { return listOf() } } } if (mayHaveValidFullSignature) { if (validFullSignature == null) { validFullSignature = desc } else { if (desc != validFullSignature) { validFullSignature = null mayHaveValidFullSignature = false } } } } // get the source method for parameter names val (bytecodeClass, bytecodeMethod) = (insns[0].insn as MethodInsnNode).fakeResolve() val sourceMethod = insns[0].target as? PsiMethod val elementFactory = JavaPsiFacade.getElementFactory(annotation.project) return validSingleArgTypes.flatMap { type -> val paramList = sourceMethod?.parameterList val psiParameter = paramList?.parameters?.firstOrNull { it.type.descriptor == type } val psiType = psiParameter?.type ?: Type.getType(type).toPsiType(elementFactory, null) val singleSignature = MethodSignature( listOf( ParameterGroup( listOf( sanitizedParameter(psiType, psiParameter?.name), ), ), ), psiType, ) if (validFullSignature != null) { val fullParamGroup = ParameterGroup( Type.getArgumentTypes(validFullSignature).withIndex().map { (index, argType) -> val psiParam = paramList?.let { bytecodeMethod.getParameter(bytecodeClass, index, it) } sanitizedParameter( psiParam?.type ?: argType.toPsiType(elementFactory), psiParam?.name, ) }, ) listOf( singleSignature, MethodSignature(listOf(fullParamGroup), psiType), ) } else { listOf(singleSignature) } } } } /* * 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.fakeResolve import com.demonwav.mcdev.platform.mixin.util.getParameter import com.demonwav.mcdev.platform.mixin.util.toPsiType import com.demonwav.mcdev.util.constantValue import com.demonwav.mcdev.util.descriptor import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiMethod import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext import org.objectweb.asm.Type import org.objectweb.asm.tree.AbstractInsnNode import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.MethodInsnNode import org.objectweb.asm.tree.MethodNode class ModifyArgHandler : InjectorAnnotationHandler() { override fun isInsnAllowed(insn: AbstractInsnNode): Boolean { return insn is MethodInsnNode } override fun expectedMethodSignature( annotation: PsiAnnotation, targetClass: ClassNode, targetMethod: MethodNode, ): List<MethodSignature>? { val index = annotation.findDeclaredAttributeValue("index")?.constantValue as? Int val validSingleArgTypes = mutableSetOf<String>() var mayHaveValidFullSignature = true var validFullSignature: String? = null val insns = resolveInstructions(annotation, targetClass, targetMethod).ifEmpty { return emptyList() } for (insn in insns) { if (insn.insn !is MethodInsnNode) return null // normalize return type so whole signature matches val desc = insn.insn.desc.replaceAfterLast(')', "V") if (index == null) { val validArgTypes = Type.getArgumentTypes(desc).mapTo(mutableListOf()) { it.descriptor } // remove duplicates completely, they are invalid val toRemove = validArgTypes.filter { e -> validArgTypes.count { it == e } > 1 }.toSet() validArgTypes.removeIf { toRemove.contains(it) } if (validArgTypes.isEmpty()) { return listOf() } if (validSingleArgTypes.isEmpty()) { validSingleArgTypes.addAll(validArgTypes) } else { validSingleArgTypes.retainAll(validArgTypes.toSet()) if (validSingleArgTypes.isEmpty()) { return listOf() } } } else { val singleArgType = Type.getArgumentTypes(desc).getOrNull(index)?.descriptor ?: return listOf() if (validSingleArgTypes.isEmpty()) { validSingleArgTypes += singleArgType } else { validSingleArgTypes.removeIf { it != singleArgType } if (validSingleArgTypes.isEmpty()) { return listOf() } } } if (mayHaveValidFullSignature) { if (validFullSignature == null) { validFullSignature = desc } else { if (desc != validFullSignature) { validFullSignature = null mayHaveValidFullSignature = false } } } } // get the source method for parameter names val (bytecodeClass, bytecodeMethod) = (insns[0].insn as MethodInsnNode).fakeResolve() val sourceMethod = insns[0].target as? PsiMethod val elementFactory = JavaPsiFacade.getElementFactory(annotation.project) return validSingleArgTypes.flatMap { type -> val paramList = sourceMethod?.parameterList val psiParameter = paramList?.parameters?.firstOrNull { it.type.descriptor == type } val psiType = psiParameter?.type ?: Type.getType(type).toPsiType(elementFactory, null) val singleSignature = MethodSignature( listOf( ParameterGroup( listOf( sanitizedParameter(psiType, psiParameter?.name), ), ), ), psiType, ) if (validFullSignature != null) { val fullParamGroup = ParameterGroup( Type.getArgumentTypes(validFullSignature).withIndex().map { (index, argType) -> val psiParam = paramList?.let { bytecodeMethod.getParameter(bytecodeClass, index, it) } sanitizedParameter( psiParam?.type ?: argType.toPsiType(elementFactory), psiParam?.name, ) }, ) listOf( singleSignature, MethodSignature(listOf(fullParamGroup), psiType), ) } else { listOf(singleSignature) } } } override val mixinExtrasExpressionContextType = ExpressionContext.Type.MODIFY_ARG }

Add build comment

Mute test

Server communication failure

Run custom build

TODO

Responsibility

Edit tags

Loading...

Are you sure?