MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[fus] Simplify regex in JdkComboBoxCollector#findSdkVersion

Browse Source 
IJ-CR-126919

GitOrigin-RevId: 941a8a1ddb5201d42d72ce25e4f73ae0061aad41
This commit is contained in:
Louis Vignier
2024-03-14 17:34:07 +00:00
committed by intellij-monorepo-bot
parent 7d8c211ce1
commit 9d354331ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/projectWizard/JdkComboBoxCollector.kt
+3 -2
View File
@@ -13,6 +13,7 @@ import org.jetbrains.jps.model.java.JdkVersionDetector
internal object JdkComboBoxCollector: CounterUsagesCollector() {
private val GROUP: EventLogGroup = EventLogGroup("npw.jdk.combo", 2)
private const val UNKNOWN_VENDOR = "unknown"
@OptIn(ExperimentalStdlibApi::class)
private val KNOWN_VENDORS = JdkVersionDetector.Variant.entries
.mapNotNull { it.displayName }
.toList() + UNKNOWN_VENDOR
@@ -48,8 +49,8 @@ internal object JdkComboBoxCollector: CounterUsagesCollector() {
null -> -1
else -> {
val matchResult = when {
"GraalVM" in sdkVersionString -> Regex("Java ([0-9]+)(?:[.0-9]+)?").find(sdkVersionString)
else -> Regex("([0-9]+)(?:[.0-9]+)?").find(sdkVersionString)
"GraalVM" in sdkVersionString -> Regex("Java ([0-9]+)").find(sdkVersionString)
else -> Regex("([0-9]+)").find(sdkVersionString)
}
matchResult?.groups?.get(1)?.value?.toInt() ?: -1
}