From f9f4aefb2a47879256fb813d62b2ddb5ba264cb8 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 9 Oct 2014 11:41:09 +0400
Subject: [PATCH] Evaluate expression: check for errors before running extract
 function for code fragment

---
 .../evaluate/KotlinEvaluationBuilder.kt       | 51 ++++++++++---------
 .../extractFunctionForDebuggerUtil.kt         |  2 -
 .../src/evaluate/singleBreakpoint/errors.kt   |  3 ++
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
index f096aef72e6..8f03fde6d67 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -71,6 +71,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.jet.analyzer.AnalyzeExhaust
 
 private val RECEIVER_NAME = "\$receiver"
 private val THIS_NAME = "this"
@@ -139,6 +140,8 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
 
     class object {
         private fun extractAndCompile(codeFragment: JetCodeFragment, sourcePosition: SourcePosition): CompiledDataDescriptor {
+            codeFragment.checkForErrors(codeFragment.getAnalysisResults())
+
             val extractedFunction = getFunctionForExtractedFragment(codeFragment, sourcePosition.getFile(), sourcePosition.getLine())
             if (extractedFunction == null) {
                 throw IllegalStateException("Code fragment cannot be extracted to function")
@@ -229,26 +232,14 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
             return runReadAction {
                 val file = createFileForDebugger(codeFragment, extractedFunction)
 
-                checkForSyntacticErrors(file)
-
                 val analyzeExhaust = file.getAnalysisResults()
-                if (analyzeExhaust.isError()) {
-                    exception(analyzeExhaust.getError())
-                }
-
-                val bindingContext = analyzeExhaust.getBindingContext()
-                bindingContext.getDiagnostics().forEach {
-                    diagnostic ->
-                    if (diagnostic.getSeverity() == Severity.ERROR) {
-                        exception(DefaultErrorMessages.RENDERER.render(diagnostic))
-                    }
-                }
+                file.checkForErrors(analyzeExhaust)
 
                 val state = GenerationState(
                         file.getProject(),
                         ClassBuilderFactories.BINARIES,
                         analyzeExhaust.getModuleDescriptor(),
-                        bindingContext,
+                        analyzeExhaust.getBindingContext(),
                         listOf(file)
                 )
 
@@ -267,6 +258,29 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
             }
             throw EvaluateExceptionUtil.createEvaluateException(e)
         }
+
+        private fun JetFile.checkForErrors(analyzeExhaust: AnalyzeExhaust) {
+            runReadAction {
+                try {
+                    AnalyzingUtils.checkForSyntacticErrors(this)
+                }
+                catch (e: IllegalArgumentException) {
+                    throw EvaluateExceptionUtil.createEvaluateException(e.getMessage())
+                }
+
+                if (analyzeExhaust.isError()) {
+                    throw EvaluateExceptionUtil.createEvaluateException(analyzeExhaust.getError())
+                }
+
+                val bindingContext = analyzeExhaust.getBindingContext()
+                bindingContext.getDiagnostics().forEach {
+                    diagnostic ->
+                    if (diagnostic.getSeverity() == Severity.ERROR) {
+                        throw EvaluateExceptionUtil.createEvaluateException(DefaultErrorMessages.RENDERER.render(diagnostic))
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -301,15 +315,6 @@ private fun createFileForDebugger(codeFragment: JetCodeFragment,
     return jetFile
 }
 
-fun checkForSyntacticErrors(file: JetFile) {
-    try {
-        AnalyzingUtils.checkForSyntacticErrors(file)
-    }
-    catch (e: IllegalArgumentException) {
-        throw EvaluateExceptionUtil.createEvaluateException(e.getMessage())
-    }
-}
-
 private fun SuspendContext.getInvokePolicy(): Int {
     return if (getSuspendPolicy() == EventRequest.SUSPEND_EVENT_THREAD) ObjectReference.INVOKE_SINGLE_THREADED else 0
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
index bdafd3c3e7e..1f75b3cb08b 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
@@ -73,8 +73,6 @@ fun getFunctionForExtractedFragment(
     }
 
     fun generateFunction(): JetNamedFunction? {
-        checkForSyntacticErrors(codeFragment)
-
         val originalFile = breakpointFile as JetFile
 
         val tmpFile = originalFile.createTempCopy { it }
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt
index c32b5958d0b..48f91f15e23 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt
@@ -21,6 +21,9 @@ open class Base {
 // EXPRESSION: a
 // RESULT: Unresolved reference: a
 
+// EXPRESSION: a + 1
+// RESULT: Unresolved reference: a
+
 // EXPRESSION: prop.
 // RESULT: Expecting an element; looking at ERROR_ELEMENT '(1,6) in /fragment.kt