azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing environment reuse diagnostics, because it breaks many tests

Browse Source 
(cherry picked from commit 857488f)
This commit is contained in:
Ilya Chernikov
2015-10-17 22:28:47 +02:00
parent 56735b3302
commit 25a128a8c6
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+1 -9
View File
@@ -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) val environment = KotlinCoreEnvironment(parentDisposable, getOrCreateApplicationEnvironmentForProduction(configuration, configFilePaths), configuration)
@@ -272,14 +269,9 @@ public class KotlinCoreEnvironment private constructor(
private fun getOrCreateApplicationEnvironmentForProduction(configuration: CompilerConfiguration, configFilePaths: List<String>): JavaCoreApplicationEnvironment { private fun getOrCreateApplicationEnvironmentForProduction(configuration: CompilerConfiguration, configFilePaths: List<String>): JavaCoreApplicationEnvironment {
synchronized (APPLICATION_LOCK) { synchronized (APPLICATION_LOCK) {
if (ourApplicationEnvironment != null) { if (ourApplicationEnvironment != null)
configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)?.report(CompilerMessageSeverity.INFO,
"Using existing app environment", CompilerMessageLocation.NO_LOCATION)
return ourApplicationEnvironment!! return ourApplicationEnvironment!!
}
configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)?.report(CompilerMessageSeverity.INFO,
"Creating new app environment", CompilerMessageLocation.NO_LOCATION)
val parentDisposable = Disposer.newDisposable() val parentDisposable = Disposer.newDisposable()
ourApplicationEnvironment = createApplicationEnvironment(parentDisposable, configuration, configFilePaths) ourApplicationEnvironment = createApplicationEnvironment(parentDisposable, configuration, configFilePaths)
ourProjectCount = 0 ourProjectCount = 0