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

[jdk] Improve version matching for .tool-versions

Browse Source 
GitOrigin-RevId: 0f00f6dc0705093f5f25d26c0e1b4187fde3f8b3
This commit is contained in:
Louis Vignier
2025-07-07 12:28:58 +00:00
committed by intellij-monorepo-bot
parent 5390bfbeb0
commit 12fb184765
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/ToolVersionsConfigurationProvider.kt
+7 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.projectRoots.impl
import com.intellij.openapi.diagnostic.logger
@@ -12,10 +12,10 @@ private val LOG = logger<ToolVersionsConfigurationProvider>()
data class AsdfReleaseData(val name: String, val vendor: String, val version: String) {
companion object {
private val regex: Regex = Regex("([\\w\\-]+)-([0-9][^-_+]*)")
private val regex: Regex = Regex("([\\w\\-]+)-([0-9][^-_+b\\s]*)\\S*")
fun parse(text: String): AsdfReleaseData? {
val matchResult = regex.find(text) ?: return null
val matchResult = regex.matchEntire(text) ?: return null
return AsdfReleaseData(
text,
matchResult.groups[1]?.value ?: return null,
@@ -24,9 +24,11 @@ data class AsdfReleaseData(val name: String, val vendor: String, val version: St
}
}
val normalizedVersion: String = version.split(".").take(3).joinToString(".")
fun matchVersionString(versionString: @NlsSafe String): Boolean {
LOG.info("Matching '$versionString'")
if (version !in versionString) return false
if (normalizedVersion !in versionString) return false
val variant = when (vendor) {
"adoptopenjdk", "adoptopenjdk-jre" -> JdkVersionDetector.Variant.AdoptOpenJdk_HS
@@ -61,7 +63,7 @@ class ToolVersionsConfigurationProvider : ExternalJavaConfigurationProvider<Asdf
val releaseDataText = text.lines()
.find { it.split(" ").firstOrNull() == "java" }
?.substringAfter(" ") ?: return null
return AsdfReleaseData.parse(releaseDataText)
return AsdfReleaseData.parse(releaseDataText.trim())
}
override fun matchAgainstSdk(releaseData: AsdfReleaseData, sdk: Sdk): Boolean {
java/java-tests/testSrc/com/intellij/openapi/projectRoots/impl/ToolVersionsWatcherTest.kt
+5 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.projectRoots.impl
import com.intellij.platform.util.coroutines.childScope
@@ -60,15 +60,17 @@ class ToolVersionsWatcherLightTests : BasePlatformTestCase() {
for ((candidate, version) in mapOf(
//"corretto-8.342.07.3" to "Amazon Corretto 1.8.0_342",
//"liberica-8u292+10" to "BellSoft Liberica 1.8.0_292",
//"zulu-8.66.0.15" to "Azul Zulu 8.0.352",
"corretto-17.0.10.7.1" to "Amazon Corretto 17.0.10",
"jetbrains-17.0.5b469.71" to "JetBrains Runtime 17.0.5",
"liberica-17.0.3+7" to "BellSoft Liberica 17.0.3",
"openjdk-17.0.1" to "Oracle OpenJDK 17.0.1",
"sapmachine-17.0.1" to "SAP SapMachine 17.0.1",
"semeru-openj9-17.0.4+8_openj9-0.33.0" to "IBM Semeru 17.0.4",
"temurin-17.0.7+7" to "Eclipse Temurin 17.0.7",
//"zulu-8.66.0.15" to "Azul Zulu 8.0.352",
"adoptopenjdk-21.0.2+13.0.LTS" to "AdoptOpenJDK (HotSpot) 21.0.2",
"graalvm-community-21.0.2" to "GraalVM CE 23.1.2 - Java 21.0.2",
"corretto-17.0.10.7.1" to "GraalVM 23.0.3 - Java 17.0.10",
)) {
assert(
AsdfReleaseData.parse(candidate)?.matchVersionString(version) == true