From 0de6db974031624a7c0603b0047783eb5ff07b3e Mon Sep 17 00:00:00 2001 From: "Egor.Skrypnikov" Date: Mon, 31 Mar 2025 15:40:03 +0200 Subject: [PATCH] [Rider] Wrap the contributor refactoring up, fixing the ancient bug making the FQN lookup slow and RIDER-121674 (cherry picked from commit db260ae5389cbd0261cf5d3bbc3e99ec2ec585c9) GitOrigin-RevId: a913385e54de4c1f0a9c59be5fd5e4617a50a23f --- .../actions/searcheverywhere/AbstractGotoSEContributor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.kt b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.kt index bf4a1d6087c5..dc1473b31a46 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.kt +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.kt @@ -297,12 +297,13 @@ abstract class AbstractGotoSEContributor protected constructor(event: AnActionEv ) { fetchWeightedElementsMixing( pattern, progressIndicator, consumer, - { localPattern, localProgressIndicator, localConsumer -> performByGotoContributorSearch(localPattern, localProgressIndicator, localConsumer) }, + // Ordering is important here *( contributorModules?.map2Array>) -> Unit> { { localPattern, localProgressIndicator, localConsumer -> it.perProductFetchWeightedElements(localPattern, localProgressIndicator, localConsumer) } } ?: emptyArray() - ) + ), + { localPattern, localProgressIndicator, localConsumer -> performByGotoContributorSearch(localPattern, localProgressIndicator, localConsumer) }, ) }