From aab67a4d4411f07c34c8f8f4fef826a6b24e8919 Mon Sep 17 00:00:00 2001 From: Sergei Tachenov Date: Tue, 27 Aug 2024 10:28:20 +0300 Subject: [PATCH] IJPL-158176 Fix NPE in MixedListFactory.createModel GitOrigin-RevId: 1a416c731d3728a91f4d3373df1c121417c8973b --- .../ide/actions/searcheverywhere/MixedListFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MixedListFactory.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MixedListFactory.java index e9e7b9ad1e4f..0a7932bf576b 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MixedListFactory.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MixedListFactory.java @@ -5,6 +5,7 @@ import com.intellij.openapi.options.advanced.AdvancedSettings; import com.intellij.openapi.util.Computable; import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -38,8 +39,10 @@ final class MixedListFactory extends SEResultsListFactory { Map priorities = getContributorsPriorities(); Comparator prioritizedContributorsComparator = (element1, element2) -> { - int firstElementPriority = priorities.getOrDefault(element1.getContributor().getSearchProviderId(), 0); - int secondElementPriority = priorities.getOrDefault(element2.getContributor().getSearchProviderId(), 0); + @Nullable SearchEverywhereContributor contributor1 = element1.getContributor(); + @Nullable SearchEverywhereContributor contributor2 = element2.getContributor(); + int firstElementPriority = contributor1 == null ? 0 : priorities.getOrDefault(contributor1.getSearchProviderId(), 0); + int secondElementPriority = contributor2 == null ? 0 : priorities.getOrDefault(contributor2.getSearchProviderId(), 0); return Integer.compare(firstElementPriority, secondElementPriority); };