Skip to content

New: Support @Shadow constructors. #2598

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

Draft
LlamaLad7 wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

New: Support @Shadow constructors. #2598

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
override fun resolveTarget(annotation: PsiAnnotation, targetClass: ClassNode): List<MixinTargetMember> {
if (hasAliases(annotation)) return emptyList()
val member = annotation.parentOfType<PsiMember>() ?: return emptyList()
val name = stripPrefix(annotation, member) ?: return emptyList()
val name = getEffectiveName(annotation, member) ?: return emptyList()
return when (member) {
is PsiMethod -> listOfNotNull(
targetClass.findMethod(MemberReference(name, member.descriptor))
Expand All @@ -75,7 +75,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
is PsiField -> "field"
else -> return null
}
return "Unresolved $type ${member.name} in target class"
return "Unresolved $type ${getEffectiveName(annotation, member)} in target class"
}

fun findFirstShadowTargetForNavigation(member: PsiMember): SmartPsiElementPointer<PsiElement>? {
Expand All @@ -94,7 +94,10 @@ class ShadowHandler : MixinMemberAnnotationHandler {

private fun hasAliases(shadow: PsiAnnotation) = shadow.findDeclaredAttributeValue("aliases").isNotEmpty()

private fun stripPrefix(shadow: PsiAnnotation, member: PsiMember): String? {
private fun getEffectiveName(shadow: PsiAnnotation, member: PsiMember): String? {
if (member is PsiMethod && member.isConstructor) {
return "<init>"
}
// Strip prefix
val prefix = shadow.findDeclaredAttributeValue("prefix")?.constantStringValue
?: MixinConstants.DEFAULT_SHADOW_PREFIX
Expand Down
10 changes: 7 additions & 3 deletions src/main/kotlin/util/bytecode-utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,13 @@ private fun PsiMethod.appendDescriptor(builder: StringBuilder): StringBuilder {
builder.append('(')
if (isConstructor) {
containingClass?.let { containingClass ->
if (containingClass.hasModifierProperty(PsiModifier.STATIC)) return@let
val outerClass = containingClass.containingClass
outerClass?.type()?.appendDescriptor(builder)
if (!containingClass.hasModifierProperty(PsiModifier.STATIC)) {
val outerClass = containingClass.containingClass
outerClass?.type()?.appendDescriptor(builder)
}
if (containingClass.isEnum) {
builder.append("Ljava/lang/String;I")
}
}
}
for (parameter in parameterList.parameters) {
Expand Down
Loading