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

Drop min functions from addToStdlib.kt

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-04-19 13:46:16 +03:00
committed by TeamCityServer
parent d114913cd2
commit e5b7cf23d6
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt
+1 -2
View File
@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.scripting.compiler.plugin.repl.*
import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
import org.jetbrains.kotlin.scripting.resolve.skipExtensionsResolutionForImplicits
import org.jetbrains.kotlin.scripting.resolve.skipExtensionsResolutionForImplicitsExceptInnermost
import org.jetbrains.kotlin.utils.addToStdlib.min
import java.util.concurrent.atomic.AtomicInteger
import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -301,7 +300,7 @@ open class KJvmReplCompilerBase<AnalyzerT : ReplCodeAnalyzerBase> protected cons
.map { KotlinType(it.get().scriptClassFQName) }
.toList()
val skipFirstTime = allPreviousLines.subList(0, min(1, allPreviousLines.size))
val skipFirstTime = allPreviousLines.subList(0, minOf(1, allPreviousLines.size))
val skipAlways =
if (allPreviousLines.isEmpty()) emptyList()
else allPreviousLines.subList(1, allPreviousLines.size)