Debugger: do not log ProcessCanceledException. Show error message fo WMDisconnectedException
This commit is contained in:
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.debugger.evaluate
|
package org.jetbrains.kotlin.idea.debugger.evaluate
|
||||||
|
|
||||||
|
import com.intellij.debugger.DebuggerBundle
|
||||||
import com.intellij.debugger.SourcePosition
|
import com.intellij.debugger.SourcePosition
|
||||||
import com.intellij.debugger.engine.SuspendContext
|
import com.intellij.debugger.engine.SuspendContext
|
||||||
import com.intellij.debugger.engine.evaluation.EvaluateException
|
import com.intellij.debugger.engine.evaluation.EvaluateException
|
||||||
@@ -24,6 +25,7 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
|
|||||||
import com.intellij.debugger.engine.evaluation.expression.*
|
import com.intellij.debugger.engine.evaluation.expression.*
|
||||||
import com.intellij.openapi.diagnostic.Attachment
|
import com.intellij.openapi.diagnostic.Attachment
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
import com.intellij.openapi.diagnostic.Logger
|
||||||
|
import com.intellij.openapi.progress.ProcessCanceledException
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.vfs.CharsetToolkit
|
import com.intellij.openapi.vfs.CharsetToolkit
|
||||||
import com.intellij.psi.JavaPsiFacade
|
import com.intellij.psi.JavaPsiFacade
|
||||||
@@ -134,6 +136,12 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
|
|||||||
catch(e: EvaluateException) {
|
catch(e: EvaluateException) {
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
|
catch(e: ProcessCanceledException) {
|
||||||
|
exception(e)
|
||||||
|
}
|
||||||
|
catch(e: VMDisconnectedException) {
|
||||||
|
exception(DebuggerBundle.message("error.vm.disconnected"))
|
||||||
|
}
|
||||||
catch (e: Exception) {
|
catch (e: Exception) {
|
||||||
val attachments = array(attachmentByPsiFile(sourcePosition.getFile()),
|
val attachments = array(attachmentByPsiFile(sourcePosition.getFile()),
|
||||||
attachmentByPsiFile(codeFragment),
|
attachmentByPsiFile(codeFragment),
|
||||||
|
|||||||
Reference in New Issue
Block a user