From 25a128a8c66480f60878b0268e7d85273639d83e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Sat, 17 Oct 2015 22:28:47 +0200 Subject: [PATCH] Removing environment reuse diagnostics, because it breaks many tests (cherry picked from commit 857488f) --- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 510d6f4623d..e940ba2e616 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 @@ -249,9 +249,6 @@ public class KotlinCoreEnvironment private constructor( } } }) - } else { - configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)?.report(CompilerMessageSeverity.INFO, - "App environment reuse enabled", CompilerMessageLocation.NO_LOCATION) } val environment = KotlinCoreEnvironment(parentDisposable, getOrCreateApplicationEnvironmentForProduction(configuration, configFilePaths), configuration) @@ -272,14 +269,9 @@ public class KotlinCoreEnvironment private constructor( private fun getOrCreateApplicationEnvironmentForProduction(configuration: CompilerConfiguration, configFilePaths: List): JavaCoreApplicationEnvironment { synchronized (APPLICATION_LOCK) { - if (ourApplicationEnvironment != null) { - configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)?.report(CompilerMessageSeverity.INFO, - "Using existing app environment", CompilerMessageLocation.NO_LOCATION) + if (ourApplicationEnvironment != null) return ourApplicationEnvironment!! - } - configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)?.report(CompilerMessageSeverity.INFO, - "Creating new app environment", CompilerMessageLocation.NO_LOCATION) val parentDisposable = Disposer.newDisposable() ourApplicationEnvironment = createApplicationEnvironment(parentDisposable, configuration, configFilePaths) ourProjectCount = 0