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-302414 2022.3 EAP SDK issue - Run configs created against a 2022.3 EAP SDK don't use the correct classpath

Browse Source 
add missing replacements

GitOrigin-RevId: 89f26837c063d09055d15307e7d8f9d4ef5a759f
This commit is contained in:
Yann Cébron
2023-05-23 17:43:48 +00:00
committed by intellij-monorepo-bot
parent a7c9ff2c57
commit 2f338d3a1f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/devkit-core/src/run/ProductInfo.kt
+5 -2
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.run
import com.intellij.openapi.application.ex.ApplicationEx
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.util.SystemInfo
import org.jetbrains.io.JsonReaderEx
@@ -15,8 +16,8 @@ import java.nio.file.Path
internal fun loadProductInfo(ideaJdkHome: String): ProductInfo? {
val ideHomePath = Path.of(ideaJdkHome)
val productInfoJsonPath = when {
SystemInfo.isMac -> ideHomePath.resolve("Resources/product-info.json")
else -> ideHomePath.resolve("product-info.json")
SystemInfo.isMac -> ideHomePath.resolve(ApplicationEx.PRODUCT_INFO_FILE_NAME_MAC)
else -> ideHomePath.resolve(ApplicationEx.PRODUCT_INFO_FILE_NAME)
}
if (Files.notExists(productInfoJsonPath)) return null
@@ -29,6 +30,8 @@ internal fun loadProductInfo(ideaJdkHome: String): ProductInfo? {
var additionalJvmArguments = launchMap["additionalJvmArguments"] as? MutableList<String> ?: return null
additionalJvmArguments = additionalJvmArguments.map { s: String ->
s.replace("\$APP_PACKAGE", ideaJdkHome)
.replace("\$IDE_HOME", ideaJdkHome)
.replace("%IDE_HOME%", ideaJdkHome)
.replace("Contents/Contents", "Contents")
}.toMutableList()