From 1ce361e90bd76d0becb9392a8b029ae5549c5b8d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Apr 2018 16:08:11 +0300 Subject: [PATCH] Use KotlinCoreEnvironment for parsing Kotlin in IC Creating and disposing CoreApplicationEnvironment on each call leads to problems with parallel builds, while KotlinCoreEnvironment avoids disposing application environment in case of parallel builds. #KT-23694 fixed Original commit: bd50ad87ba84527c3dcab5c25f1ce2fe44086303 --- .../org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt index 998f615ceff..66ace28275e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt @@ -104,7 +104,7 @@ object CompilerRunnerUtil { environment: JpsCompilerEnvironment, files: Set ): Set = withCompilerClassloader(environment) { classLoader -> - val klass = Class.forName("org.jetbrains.kotlin.parsing.util.ParseFileUtilsKt", true, classLoader) + val klass = Class.forName("org.jetbrains.kotlin.incremental.parsing.ParseFileUtilsKt", true, classLoader) val method = klass.getMethod("classesFqNames", Set::class.java) @Suppress("UNCHECKED_CAST") method.invoke(klass, files) as? Set