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

KtScratchExecutionSession: shouldn't catch ControlFlowException

Browse Source 
#EA-210849 Fixed
This commit is contained in:
Dmitry Gridin
2019-10-09 14:18:39 +07:00
parent 79cb10a755
commit ee8e9a76f9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt
+5 -3
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.scratch.compile
import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.execution.process.CapturingProcessHandler import com.intellij.execution.process.CapturingProcessHandler
import com.intellij.openapi.diagnostic.ControlFlowException
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.Task import com.intellij.openapi.progress.Task
@@ -36,7 +37,7 @@ class KtScratchExecutionSession(
private val executor: KtCompilingExecutor private val executor: KtCompilingExecutor
) { ) {
companion object { companion object {
private val TIMEOUT_MS = 30000 private const val TIMEOUT_MS = 30000
} }
private var backgroundProcessIndicator: ProgressIndicator? = null private var backgroundProcessIndicator: ProgressIndicator? = null
@@ -47,8 +48,7 @@ class KtScratchExecutionSession(
val expressions = file.getExpressions() val expressions = file.getExpressions()
if (!executor.checkForErrors(psiFile, expressions)) return if (!executor.checkForErrors(psiFile, expressions)) return
val result = runReadAction { KtScratchSourceFileProcessor().process(expressions) } when (val result = runReadAction { KtScratchSourceFileProcessor().process(expressions) }) {
when (result) {
is KtScratchSourceFileProcessor.Result.Error -> return executor.errorOccurs(result.message, isFatal = true) is KtScratchSourceFileProcessor.Result.Error -> return executor.errorOccurs(result.message, isFatal = true)
is KtScratchSourceFileProcessor.Result.OK -> { is KtScratchSourceFileProcessor.Result.OK -> {
LOG.printDebugMessage("After processing by KtScratchSourceFileProcessor:\n ${result.code}") LOG.printDebugMessage("After processing by KtScratchSourceFileProcessor:\n ${result.code}")
@@ -91,6 +91,8 @@ class KtScratchExecutionSession(
callback() callback()
} }
} catch (e: Throwable) { } catch (e: Throwable) {
if (e is ControlFlowException) throw e
LOG.printDebugMessage(result.code) LOG.printDebugMessage(result.code)
executor.errorOccurs(e.message ?: "Couldn't compile ${psiFile.name}", e, isFatal = true) executor.errorOccurs(e.message ?: "Couldn't compile ${psiFile.name}", e, isFatal = true)
} }