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

IDEA-206484 "Switch Boot Runtime" dialog: Some local JDKs are shown as "Undefined[Local]" in drop-down list

Browse Source
This commit is contained in:
Denis Fokin
2019-02-11 20:14:24 +03:00
parent 7ca9a17297
commit 9157a41dff
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/bootRuntime/bundles/Runtime.kt
+9 -1
View File
@@ -6,10 +6,18 @@ import com.intellij.execution.ExecutionException
import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.execution.util.ExecUtil
import com.intellij.openapi.application.PathManager
import com.intellij.openapi.util.SystemInfo
import java.io.File
abstract class Runtime(initialLocation:File) {
val JAVA_FILE_NAME by lazy {
if (SystemInfo.isWindows) {
return@lazy "java.exe"
}
return@lazy "java"
}
open val fileName: String by lazy {
initialLocation.name
}
@@ -34,7 +42,7 @@ abstract class Runtime(initialLocation:File) {
}
protected fun fetchVersion (): String {
val javaFile = installationPath.walk().filter { file -> file.nameWithoutExtension == "java" }.first()
val javaFile = installationPath.walk().filter { file -> file.name == JAVA_FILE_NAME }.first()
try {
val output = ExecUtil.execAndGetOutput(GeneralCommandLine(javaFile.path, "-version"))
val matchResult: MatchResult? = "version \"(\\d?(.\\d)*(.\\d)*_*\\d*\\d*-*(ea|release|internal)*)\"".toRegex().find(output.stderr)