From ba73ed5ac535986dc60bf28ae37de30aae97eba4 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 11 Apr 2018 19:16:25 +0200
Subject: [PATCH] [platform] prefers an older but compatible plugin
 (IDEA-188964)

---
 .../src/com/intellij/ide/plugins/PluginManagerCore.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index ae051820d304..ffdffb7533f4 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -898,7 +898,12 @@ public class PluginManagerCore {
         if (oldIndex >= 0) {
           IdeaPluginDescriptorImpl oldDescriptor = result.get(oldIndex);
           if (StringUtil.compareVersionNumbers(oldDescriptor.getVersion(), descriptor.getVersion()) < 0) {
-            result.set(oldIndex, descriptor);
+            if (isIncompatible(descriptor) && isCompatible(oldDescriptor)) {
+              getLogger().info("newer plugin is incompatible, ignoring: " + descriptor.getPath());
+            }
+            else {
+              result.set(oldIndex, descriptor);
+            }
           }
         }
         else {