Skip to content

Fix mixin autocomplete spinning indefinitely in classes with many lambdas #2596

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

Open
embeddedt wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix mixin autocomplete spinning indefinitely in classes with many lambdas #2596

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
20 changes: 10 additions & 10 deletions src/main/kotlin/platform/mixin/util/AsmUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import com.demonwav.mcdev.util.findMethods
import com.demonwav.mcdev.util.findModule
import com.demonwav.mcdev.util.findQualifiedClass
import com.demonwav.mcdev.util.fullQualifiedName
import com.demonwav.mcdev.util.hasSyntheticMethod
import com.demonwav.mcdev.util.innerIndexAndName
import com.demonwav.mcdev.util.isErasureEquivalentTo
import com.demonwav.mcdev.util.localClasses
Expand Down Expand Up @@ -729,17 +728,20 @@ private fun findContainingMethod(clazz: ClassNode, lambdaMethod: MethodNode): Pa
else -> return@nextInsn
}

// check if this lambda generated a synthetic method
// Count every LambdaMetafactory invokedynamic unconditionally so the index matches
// a PSI walk that counts all lambda expressions and method references without needing
// to call hasSyntheticMethod to filter them.
lambdaCount++
val lambdaCountThisLine =
lineNumber?.let { lambdaCountPerLine.merge(it, 1, Int::plus) } ?: lambdaCount

// Only record an entry when the lambda generated a synthetic method in this class.
if (invokedMethod.owner != clazz.name) return@nextInsn
val invokedMethodNode = clazz.findMethod(MemberReference(invokedMethod.name, invokedMethod.desc))
if (invokedMethodNode == null || !invokedMethodNode.hasAccess(Opcodes.ACC_SYNTHETIC)) {
return@nextInsn
}

lambdaCount++
val lambdaCountThisLine =
lineNumber?.let { lambdaCountPerLine.merge(it, 1, Int::plus) } ?: lambdaCount

if (invokedMethod.name == lambdaMethod.name && invokedMethod.desc == lambdaMethod.desc) {
val locationInfo =
SourceCodeLocationInfo(lambdaCount - 1, lineNumber, lambdaCountThisLine - 1)
Expand Down Expand Up @@ -782,10 +784,8 @@ private fun findAssociatedLambda(project: Project, scope: GlobalSearchScope, cla
// walk inside the reference first, visits the qualifier first (it's first in the bytecode)
super.visitMethodReferenceExpression(expression)

if (expression.hasSyntheticMethod(clazz.version)) {
if (matcher.accept(expression)) {
stopWalking()
}
if (matcher.accept(expression)) {
stopWalking()
}
}
},
Expand Down
Loading