improve error when since-build and until-build are equal

GitOrigin-RevId: b3ada2a1a82c8168cfec253f4be5ea9f96856fed
This commit is contained in:
Gregory.Shrago
2019-10-16 19:25:54 +00:00
committed by intellij-monorepo-bot
parent 9059da3f88
commit 8a4d60a402
3 changed files with 12 additions and 3 deletions
@@ -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";
@@ -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).
@@ -54,6 +54,11 @@
<idea-version since-build="1.0" until-build="1.111111"/>
<depends>com.intellij.modules.core</depends>
</idea-plugin>
<idea-plugin url="file://incompatible0-alt.xml">
<id>incompatible0-alt</id>
<idea-version since-build="1.111" until-build="1.111"/>
<depends>com.intellij.modules.core</depends>
</idea-plugin>
<idea-plugin url="file://incompatible1.xml">
<id>incompatible1</id>
<idea-version since-build="2001.0"/>