From ae5fefce51af5e204bd8dbfbd1d72730252c89be Mon Sep 17 00:00:00 2001 From: Ilya Muradyan Date: Mon, 22 Mar 2021 14:12:59 +0300 Subject: [PATCH] [REPL] Fix performance problem Configuration updating was done incorrectly, and it led to performance degradation. --- .../compiler/plugin/impl/KJvmReplCompilerBase.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt index 10d743c7925..8755b58c65c 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt @@ -310,12 +310,8 @@ open class KJvmReplCompilerBase protected cons else allPreviousLines.subList(1, allPreviousLines.size) return ScriptCompilationConfiguration(configuration) { - skipExtensionsResolutionForImplicits.update { - it?.also { it.toMutableList().addAll(skipAlways) } ?: skipAlways - } - skipExtensionsResolutionForImplicitsExceptInnermost.update { - it?.also { it.toMutableList().addAll(skipFirstTime) } ?: skipFirstTime - } + skipExtensionsResolutionForImplicits(*skipAlways.toTypedArray()) + skipExtensionsResolutionForImplicitsExceptInnermost(*skipFirstTime.toTypedArray()) } }