Prefer completion strings derived from the bytecode over reconstructed source code. Fixes #2515

Author: Earthcomputer

src/main/kotlin/platform/mixin/handlers/injectionPoint/FieldInjectionPoint.kt

@@ -21,12 +21,10 @@
 package com.demonwav.mcdev.platform.mixin.handlers.injectionPoint
 
 import com.demonwav.mcdev.platform.mixin.reference.MixinSelector
-import com.demonwav.mcdev.platform.mixin.reference.toMixinString
 import com.demonwav.mcdev.platform.mixin.util.fakeResolve
 import com.demonwav.mcdev.platform.mixin.util.findOrConstructSourceField
 import com.demonwav.mcdev.util.MemberReference
 import com.demonwav.mcdev.util.constantValue
-import com.demonwav.mcdev.util.getQualifiedMemberReference
 import com.intellij.codeInsight.completion.JavaLookupElementBuilder
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.openapi.editor.Editor
@@ -107,10 +105,11 @@ class FieldInjectionPoint : QualifiedInjectionPoint<PsiField>() {
         return target?.let { MyCollectVisitor(mode, at.project, it, opcode, arrayAccess, fuzz) }
     }
 
-    override fun createLookup(targetClass: ClassNode, m: PsiField, owner: String): LookupElementBuilder {
+    override fun createLookup(targetClass: ClassNode, m: PsiField, insn: AbstractInsnNode): LookupElementBuilder {
+        insn as FieldInsnNode
         return JavaLookupElementBuilder.forField(
             m,
-            m.getQualifiedMemberReference(owner).toMixinString(),
+            "L${insn.owner};.${insn.name}:${insn.desc}",
             null,
         )
             .setBoldIfInClass(m, targetClass)

src/main/kotlin/platform/mixin/handlers/injectionPoint/InjectionPoint.kt

@@ -21,7 +21,6 @@
 package com.demonwav.mcdev.platform.mixin.handlers.injectionPoint
 
 import com.demonwav.mcdev.platform.mixin.reference.MixinSelector
-import com.demonwav.mcdev.platform.mixin.reference.toMixinString
 import com.demonwav.mcdev.platform.mixin.util.InjectionPointSpecifier
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.SLICE
 import com.demonwav.mcdev.platform.mixin.util.SourceCodeLocationInfo
@@ -32,7 +31,6 @@ import com.demonwav.mcdev.util.constantValue
 import com.demonwav.mcdev.util.createLiteralExpression
 import com.demonwav.mcdev.util.findAnnotations
 import com.demonwav.mcdev.util.fullQualifiedName
-import com.demonwav.mcdev.util.getQualifiedMemberReference
 import com.demonwav.mcdev.util.internalName
 import com.demonwav.mcdev.util.memoized
 import com.demonwav.mcdev.util.realName
@@ -262,7 +260,7 @@ abstract class QualifiedInjectionPoint<T : PsiMember> : InjectionPoint<T>() {
 
     final override fun usesMemberReference() = true
 
-    protected abstract fun createLookup(targetClass: ClassNode, m: T, owner: String): LookupElementBuilder
+    protected abstract fun createLookup(targetClass: ClassNode, m: T, insn: AbstractInsnNode): LookupElementBuilder
 
     protected open fun getInternalName(m: T): String {
         return m.realName ?: m.name!!
@@ -273,7 +271,7 @@ abstract class QualifiedInjectionPoint<T : PsiMember> : InjectionPoint<T>() {
         result: CollectVisitor.Result<T>,
     ): LookupElementBuilder {
         return qualifyLookup(
-            createLookup(targetClass, result.target, result.qualifier ?: targetClass.name),
+            createLookup(targetClass, result.target, result.originalInsn),
             targetClass,
             result.target,
         )
@@ -296,10 +294,11 @@ abstract class QualifiedInjectionPoint<T : PsiMember> : InjectionPoint<T>() {
 
 abstract class AbstractMethodInjectionPoint : QualifiedInjectionPoint<PsiMethod>() {
 
-    override fun createLookup(targetClass: ClassNode, m: PsiMethod, owner: String): LookupElementBuilder {
+    override fun createLookup(targetClass: ClassNode, m: PsiMethod, insn: AbstractInsnNode): LookupElementBuilder {
+        insn as MethodInsnNode
         return JavaLookupElementBuilder.forMethod(
             m,
-            m.getQualifiedMemberReference(owner).toMixinString(),
+            "L${insn.owner};${insn.name}${insn.desc}",
             PsiSubstitutor.EMPTY,
             null,
         )

src/main/kotlin/platform/mixin/handlers/injectionPoint/NewInsnInjectionPoint.kt

@@ -27,10 +27,8 @@ import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.AT
 import com.demonwav.mcdev.platform.mixin.util.findClassNodeByPsiClass
 import com.demonwav.mcdev.platform.mixin.util.findMethod
-import com.demonwav.mcdev.platform.mixin.util.shortName
 import com.demonwav.mcdev.util.MemberReference
 import com.demonwav.mcdev.util.constantStringValue
-import com.demonwav.mcdev.util.descriptor
 import com.demonwav.mcdev.util.fullQualifiedName
 import com.demonwav.mcdev.util.internalName
 import com.demonwav.mcdev.util.shortName
@@ -110,18 +108,19 @@ class NewInsnInjectionPoint : InjectionPoint<PsiMember>() {
     }
 
     override fun createLookup(targetClass: ClassNode, result: CollectVisitor.Result<PsiMember>): LookupElementBuilder? {
+        val newInsn = result.originalInsn as? TypeInsnNode ?: return null
+        val methodInsn = findInitCall(newInsn) ?: return null
         when (val target = result.target) {
             is PsiClass -> {
                 return JavaLookupElementBuilder.forClass(target, target.internalName)
                     .withPresentableText(target.shortName ?: return null)
             }
             is PsiMethod -> {
-                val ownerName = result.qualifier?.substringAfterLast('.')?.replace('$', '.') ?: targetClass.shortName
-                val descriptorArgs = target.descriptor?.dropLast(1) ?: return null
-                val qualifierInternalName = result.qualifier?.replace('.', '/')
+                val ownerName = methodInsn.owner.substringAfterLast('/').replace('$', '.')
+                val descriptorArgs = methodInsn.desc.dropLast(1)
                 return JavaLookupElementBuilder.forMethod(
                     target,
-                    "${descriptorArgs}L$qualifierInternalName;",
+                    "${descriptorArgs}L${methodInsn.owner};",
                     PsiSubstitutor.EMPTY,
                     null,
                 )