Make sure 1.10.0 is higher than 1.10.0-SNAPSHOT in version check #…

…1155
JetBrains · Nov 17, 2022 · fd0f64b · fd0f64b
1 parent 2e3b539
commit fd0f64b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/kotlin/org/jetbrains/intellij/Version.kt b/src/main/kotlin/org/jetbrains/intellij/Version.kt
@@ -28,9 +28,9 @@ class Version(
             .or { patch - other.patch }
             .or {
                 when {
-                    version.contains('-') -> -1
-                    other.version.contains('-') -> 1
-                    else -> 0
+                    version.contains('-') && !other.version.contains('-') -> -1
+                    !version.contains('-') && other.version.contains('-') -> 1
+                    else -> version.compareTo(other.version, ignoreCase = true)
                 }
             }
             .or { version.compareTo(other.version, ignoreCase = true) }

diff --git a/src/test/kotlin/org/jetbrains/intellij/VersionTest.kt b/src/test/kotlin/org/jetbrains/intellij/VersionTest.kt
@@ -34,5 +34,6 @@ class VersionTest {
         assertTrue(Version.parse("2021.1.2") > Version.parse("2020"))
         assertEquals(Version.parse("2021.1.0-snapshot"), Version.parse("2021.1.0-SNAPSHOT"))
         assertTrue(Version.parse("2021.1.2-SNAPSHOT.2") > Version.parse("2021.1.2-SNAPSHOT.1"))
+        assertTrue(Version.parse("2021.1.2") > Version.parse("2021.1.2-SNAPSHOT.1"))
     }
 }