From 1a01ba0ae59b9ca63ae68819b9c898aca9254f52 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 21 Feb 2020 17:30:30 +0300 Subject: [PATCH] 201: Trick idea home path exception with custom `idea.home` variable --- .../src/org/jetbrains/kotlin/cli/common/CLITool.kt | 4 ++++ .../cli/jvm/compiler/KotlinCoreEnvironment.kt | 1 + .../jetbrains/kotlin/cli/jvm/compiler/compat.kt | 9 +++++++++ .../kotlin/cli/jvm/compiler/compat.kt.201 | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt create mode 100644 compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLITool.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLITool.kt index c4b978ef2e8..d3e477d82e9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLITool.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLITool.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cli.common.messages.* import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.STRONG_WARNING import org.jetbrains.kotlin.cli.jvm.compiler.CompileEnvironmentException +import org.jetbrains.kotlin.cli.jvm.compiler.setupIdeaStandaloneExecution import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.LanguageFeature.Kind.BUG_FIX import org.jetbrains.kotlin.config.LanguageFeature.State.ENABLED @@ -204,6 +205,9 @@ abstract class CLITool { if (System.getProperty(PlainTextMessageRenderer.KOTLIN_COLORS_ENABLED_PROPERTY) == null) { System.setProperty(PlainTextMessageRenderer.KOTLIN_COLORS_ENABLED_PROPERTY, "true") } + + setupIdeaStandaloneExecution() + val exitCode = doMainNoExit(compiler, args) if (exitCode != ExitCode.OK) { exitProcess(exitCode.code) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 158a462c2e1..f0a0cfc3bc1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -421,6 +421,7 @@ class KotlinCoreEnvironment private constructor( fun createForProduction( parentDisposable: Disposable, configuration: CompilerConfiguration, configFiles: EnvironmentConfigFiles ): KotlinCoreEnvironment { + setupIdeaStandaloneExecution() val appEnv = getOrCreateApplicationEnvironmentForProduction(parentDisposable, configuration) val projectEnv = ProjectEnvironment(parentDisposable, appEnv) val environment = KotlinCoreEnvironment(projectEnv, configuration, configFiles) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt new file mode 100644 index 00000000000..e7316778db5 --- /dev/null +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.cli.jvm.compiler + +fun setupIdeaStandaloneExecution() { +} \ No newline at end of file diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 new file mode 100644 index 00000000000..8c255f64e2b --- /dev/null +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt.201 @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.cli.jvm.compiler + +fun setupIdeaStandaloneExecution() { + System.getProperties().setProperty("idea.home.path", System.getProperty("java.io.tmpdir")) + System.getProperties().setProperty("project.structure.add.tools.jar.to.new.jdk", "false") + System.getProperties().setProperty("psi.track.invalidation", "true") + System.getProperties().setProperty("psi.incremental.reparse.depth.limit", "1000") + System.getProperties().setProperty("ide.hide.excluded.files", "false") +} \ No newline at end of file