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 fbaa89635918..1e58183859bb 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java @@ -1270,9 +1270,11 @@ public class PluginManagerCore { errorSuffix = ""; } else if (isIncompatible(buildNumber, descriptor.getSinceBuild(), descriptor.getUntilBuild()) != null) { - errorSuffix = "is incompatible (target build range is " + - StringUtil.notNullize(descriptor.getSinceBuild(), "0.0") + " to " + - StringUtil.notNullize(descriptor.getUntilBuild(), "*.*") + ")"; + String since = StringUtil.notNullize(descriptor.getSinceBuild(), "0.0"); + String until = StringUtil.notNullize(descriptor.getUntilBuild(), "*.*"); + errorSuffix = "is incompatible (target build " + + (since.equals(until) ? "is " + since + : "range is " + since + " to " + until) + ")"; } else if (isBrokenPlugin(descriptor)) { errorSuffix = "version was marked as incompatible"; diff --git a/platform/platform-tests/testData/plugins/sort/simplePluginSort.txt b/platform/platform-tests/testData/plugins/sort/simplePluginSort.txt index 1a0cb3ac36aa..876df86ca407 100644 --- a/platform/platform-tests/testData/plugins/sort/simplePluginSort.txt +++ b/platform/platform-tests/testData/plugins/sort/simplePluginSort.txt @@ -7,6 +7,7 @@ cycle5 + duplicate0 incompatible0 + incompatible0-alt incompatible1 incompatible2 missing1 @@ -25,6 +26,7 @@ "com.intellij.modules.duplicate" module is declared by plugins "duplicate", "duplicate", "duplicate0". No id is provided by "missing0.xml". Plugin "incompatible0" is incompatible (target build range is 1.0 to 1.111111). +Plugin "incompatible0-alt" is incompatible (target build is 1.111). Plugin "incompatible1" is incompatible (target build range is 2001.0 to *.*). Plugin "incompatible2" is incompatible (target build range is 0.0 to 1.111111). Plugin "missing4" defines no module dependencies (supported only in IntelliJ IDEA). diff --git a/platform/platform-tests/testData/plugins/sort/simplePluginSort.xml b/platform/platform-tests/testData/plugins/sort/simplePluginSort.xml index 4caa02cc2a5b..caa03a192d7a 100644 --- a/platform/platform-tests/testData/plugins/sort/simplePluginSort.xml +++ b/platform/platform-tests/testData/plugins/sort/simplePluginSort.xml @@ -54,6 +54,11 @@ com.intellij.modules.core + + incompatible0-alt + + com.intellij.modules.core + incompatible1