Skip to content

Slow Completion Fixes #2484

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
Earthcomputer merged 3 commits into from
Jun 25, 2025
Merged

Slow Completion Fixes #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f3f2e6
Fix: Run all other completion contributors before `MixinCompletionCon…
LlamaLad7 Jun 25, 2025
bef5280
Fix: Check progress when adding Mixin completion elements.
LlamaLad7 Jun 25, 2025
dd1cc6e
Perf: Check `canEverMatch` in MixinSelector.matchMethod/Field
LlamaLad7 Jun 25, 2025
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
5 changes: 5 additions & 0 deletions src/main/kotlin/platform/mixin/completion/MixinCompletionContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.completion.JavaCompletionContributor
import com.intellij.codeInsight.completion.JavaCompletionSorting
import com.intellij.codeInsight.completion.LegacyCompletionContributor
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiClassType
import com.intellij.psi.PsiExpression
Expand All @@ -58,6 +59,9 @@ class MixinCompletionContributor : CompletionContributor() {
return
}

// Run all the other contributors first
result.runRemainingContributors(parameters, result::passResult)

val superMixin = psiClass.superClass?.takeIf { it.isWritable && it.isMixin }

val javaResult = JavaCompletionSorting.addJavaSorting(parameters, result)
Expand Down Expand Up @@ -111,6 +115,7 @@ class MixinCompletionContributor : CompletionContributor() {
val name = it.name
StringUtil.isJavaIdentifier(name) && prefixMatcher.prefixMatches(name)
}
.onEach { ProgressManager.checkCanceled() }
.map { it.createLookupElement(psiClass.project) }
.filter(filter, position)
.toList()
Expand Down
6 changes: 6 additions & 0 deletions src/main/kotlin/platform/mixin/reference/MixinSelectors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ interface MixinSelector {
fun matchMethod(owner: String, name: String, desc: String): Boolean

fun matchField(field: PsiField, qualifier: PsiClass): Boolean {
if (!canEverMatch(field.name)) {
return false
}
val fqn = qualifier.fullQualifiedName ?: return false
val desc = field.descriptor ?: return false
return matchField(fqn.replace('.', '/'), field.name, desc)
Expand All @@ -115,6 +118,9 @@ interface MixinSelector {
}

fun matchMethod(method: PsiMethod, qualifier: PsiClass): Boolean {
if (!canEverMatch(method.name)) {
return false
}
val fqn = qualifier.fullQualifiedName ?: return false
val desc = method.descriptor ?: return false
return matchMethod(fqn.replace('.', '/'), method.internalName, desc)
Expand Down
Loading