From d1ed92dfc3c3d568fb2c3fb28f89890f7b13c852 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Fri, 5 Oct 2018 17:13:10 +0300
Subject: [PATCH] EA-128824 - NPE:
 PluginManagerConfigurableNew$$.customizeCellRenderer

---
 .../ide/plugins/PluginManagerConfigurableNew.java         | 2 +-
 .../com/intellij/ide/plugins/newui/SearchQueryParser.java | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
index 98218398cb91..269c48bc1629 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
@@ -919,7 +919,7 @@ public class PluginManagerConfigurableNew
           protected void customizeCellRenderer(@NotNull JList list, Object value, int index, boolean selected, boolean hasFocus) {
             IdeaPluginDescriptor descriptor = (IdeaPluginDescriptor)value;
 
-            String splitter = (String)myPopup.data;
+            String splitter = myPopup == null ? null : (String)myPopup.data;
             for (String partName : SearchQueryParser.split(descriptor.getName(), splitter)) {
               append(partName, partName.equalsIgnoreCase(splitter)
                                ? SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/SearchQueryParser.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/SearchQueryParser.java
index 16e53bc9919f..667f7f39afd0 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/SearchQueryParser.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/SearchQueryParser.java
@@ -4,6 +4,7 @@ package com.intellij.ide.plugins.newui;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.io.URLUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -17,9 +18,14 @@ public abstract class SearchQueryParser {
   public String searchQuery;
 
   @NotNull
-  public static List<String> split(@NotNull String name, @NotNull String query) {
+  public static List<String> split(@NotNull String name, @Nullable String query) {
     List<String> result = new ArrayList<>();
 
+    if (query == null) {
+      result.add(name);
+      return result;
+    }
+
     int length = name.length();
     int queryLength = query.length();
     int index = 0;