From 8d8145c3d2b58d151ed18dbf6b1deb4698de8b97 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@Andrey-Breslavs-MacBook-Pro.local>
Date: Sat, 12 Nov 2011 20:25:38 +0400
Subject: [PATCH] Better reporting in tests

---
 .../org/jetbrains/jet/codegen/CompilationErrorHandler.java  | 6 +++---
 .../src/org/jetbrains/jet/codegen/GenerationState.java      | 2 +-
 idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java b/compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java
index b6ea15aa364..8af5d8c831c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java
@@ -7,10 +7,10 @@ public interface CompilationErrorHandler {
 
     CompilationErrorHandler THROW_EXCEPTION = new CompilationErrorHandler() {
         @Override
-        public void reportError(String message, String fileUrl) {
-            throw new IllegalStateException(message);
+        public void reportException(Throwable exception, String fileUrl) {
+            throw new IllegalStateException(exception);
         }
     };
 
-    void reportError(String message, String fileUrl);
+    void reportException(Throwable exception, String fileUrl);
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
index b2097c462e1..0002b318992 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
@@ -112,7 +112,7 @@ public class GenerationState {
                     generateNamespace(namespace);
                 }
                 catch (Throwable e) {
-                    errorHandler.reportError("Exception: " + e.getClass().getCanonicalName() + ": " + e.getMessage(), namespace.getContainingFile().getVirtualFile().getUrl());
+                    errorHandler.reportException(e, namespace.getContainingFile().getVirtualFile().getUrl());
                 }
             }
         }
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
index f09506cd271..0a16cb56f58 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
@@ -104,8 +104,8 @@ public class JetCompiler implements TranslatingCompiler {
                 if (!errors) {
                     generationState.compileCorrectNamespaces(bindingContext, namespaces, new CompilationErrorHandler() {
                         @Override
-                        public void reportError(String message, String fileUrl) {
-                            compileContext.addMessage(CompilerMessageCategory.WARNING, message, fileUrl, 0, 0);
+                        public void reportException(Throwable exception, String fileUrl) {
+                            compileContext.addMessage(CompilerMessageCategory.WARNING, exception.getClass().getCanonicalName() + ": " + exception.getMessage(), fileUrl, 0, 0);
                         }
                     });
 ///////////