MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-158176 Fix NPE in MixedListFactory.createModel

Browse Source 
GitOrigin-RevId: 1a416c731d3728a91f4d3373df1c121417c8973b
This commit is contained in:
Sergei Tachenov
2024-08-27 10:28:20 +03:00
committed by intellij-monorepo-bot
parent 3857272e7d
commit aab67a4d44
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MixedListFactory.java
View File

@@ -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<String, Integer> priorities = getContributorsPriorities();
Comparator<SearchEverywhereFoundElementInfo> 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);
};