fail early when there is no core plugin in non-EAP mode

(cherry picked from commit 807834d3e3057fd002e7c706b5f216dfea7595cf) GitOrigin-RevId: 3c3e60c658053abbb8e342c2b65ce039882e4690

fail early when there is no core plugin in non-EAP mode
(cherry picked from commit 807834d3e3057fd002e7c706b5f216dfea7595cf) GitOrigin-RevId: 3c3e60c658053abbb8e342c2b65ce039882e4690
bceaf73f · Gregory.Shrago · intellij-monorepo-bot · 7bddf8d8 · bceaf73f
Commit bceaf73f authored 5 years ago by Gregory.Shrago Committed by intellij-monorepo-bot 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 2 deletions
+3 -2
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -1217,7 +1217,7 @@ public class PluginManagerCore {
    boolean shouldLoadPlugins = shouldLoadPlugins();

    Set<IdeaPluginDescriptorImpl> allDescriptors = new LinkedHashSet<>(idMap.values());
-    IdeaPluginDescriptorImpl coreDescriptor = idMap.get(PluginId.getId(CORE_PLUGIN_ID));
+    IdeaPluginDescriptorImpl coreDescriptor = notNull(idMap.get(PluginId.getId(CORE_PLUGIN_ID)));
    boolean checkModuleDependencies = !coreDescriptor.getModules().isEmpty() &&
                                      !coreDescriptor.getModules().contains(ALL_MODULES_MARKER);

@@ -1443,7 +1443,8 @@ public class PluginManagerCore {
      }
    }
    if (idMultiMap.get(PluginId.getId(CORE_PLUGIN_ID)).isEmpty()) {
-      getLogger().error(CORE_PLUGIN_ID + " not found; platform prefix is " + System.getProperty(PlatformUtils.PLATFORM_PREFIX_KEY));
+      String message = SPECIAL_IDEA_PLUGIN + " (platform prefix: " + System.getProperty(PlatformUtils.PLATFORM_PREFIX_KEY) + ")";
+      throw new EssentialPluginMissingException(Collections.singletonList(message));
    }
    Map<PluginId, IdeaPluginDescriptorImpl> idMap = new LinkedHashMap<>();
    for (PluginId id : idMultiMap.keySet()) {