From 8bc03e54f789cc4eee131612bc3d864a54041847 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Fri, 31 May 2019 15:58:11 +0300 Subject: [PATCH] Scratch: do not clear inlays in onStart This is needed for sequential executor --- .../jetbrains/kotlin/idea/scratch/compile/KtCompilingExecutor.kt | 1 + .../kotlin/idea/scratch/output/InlayScratchOutputHandler.kt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtCompilingExecutor.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtCompilingExecutor.kt index 579667bc41a..d46395777fd 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtCompilingExecutor.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtCompilingExecutor.kt @@ -34,6 +34,7 @@ class KtCompilingExecutor(file: ScratchFile) : ScratchExecutor(file) { private var session: KtScratchExecutionSession? = null override fun execute() { + handler.clear(file) handler.onStart(file) session = KtScratchExecutionSession(file, this) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt index fbba13b8c22..3ab134d2088 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt @@ -29,7 +29,6 @@ object InlayScratchOutputHandler : ScratchOutputHandler { private const val minSpaceCount = 4 override fun onStart(file: ScratchFile) { - clear(file) } override fun handle(file: ScratchFile, expression: ScratchExpression, output: ScratchOutput) {