Skip to content

Commit 622f484

Browse files
committed
pattern matching using regex
1 parent 82d55b2 commit 622f484

File tree

1 file changed

+5
-2
lines changed
  • server/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/scala

1 file changed

+5
-2
lines changed

server/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/scala/ScalaSdkResolver.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ class ScalaSdkResolver(private val bazelPathsResolver: BazelPathsResolver) {
4343
JarFile(path.toFile()).use { jar ->
4444
jar.manifest?.mainAttributes?.let { attributes ->
4545
attributes.getValue("Bundle-Version")?.let {
46-
val version = it.split("-").first()
47-
return version
46+
val versionMatcher = JAR_VERSION_PATTERN.matcher(it)
47+
if (versionMatcher.find()) {
48+
return versionMatcher.group(1)
49+
}
4850
}
4951
}
5052
}
@@ -64,5 +66,6 @@ class ScalaSdkResolver(private val bazelPathsResolver: BazelPathsResolver) {
6466
companion object {
6567
private val VERSION_PATTERN =
6668
Pattern.compile("(?:processed_)?scala3?-(?:library|compiler|reflect)(?:_3)?-([.\\d]+)\\.jar")
69+
private val JAR_VERSION_PATTERN = Pattern.compile("(\\d+\\.\\d+\\.\\d+)")
6770
}
6871
}

0 commit comments

Comments
 (0)