From 51bc9d8fd824fa586b8b16f1b5b2f0c4a2164a74 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 13 Mar 2015 13:44:16 +0300
Subject: [PATCH] Debugger: do not log ProcessCanceledException. Show error
 message fo WMDisconnectedException

---
 .../idea/debugger/evaluate/KotlinEvaluationBuilder.kt     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
index 7bd660fe45f..8d250d39f04 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.idea.debugger.evaluate
 
+import com.intellij.debugger.DebuggerBundle
 import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.engine.SuspendContext
 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.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.CharsetToolkit
 import com.intellij.psi.JavaPsiFacade
@@ -134,6 +136,12 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
         catch(e: EvaluateException) {
             throw e
         }
+        catch(e: ProcessCanceledException) {
+            exception(e)
+        }
+        catch(e: VMDisconnectedException) {
+            exception(DebuggerBundle.message("error.vm.disconnected"))
+        }
         catch (e: Exception) {
             val attachments = array(attachmentByPsiFile(sourcePosition.getFile()),
                                     attachmentByPsiFile(codeFragment),