From c0890ccc37b8a861c97b507458c54dcd52944cda Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Tue, 29 Oct 2013 15:40:43 +0400
Subject: [PATCH] improved debug message for temporary traces added file name

---
 .../jetbrains/jet/lang/resolve/AnalyzingUtils.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java
index beddfd96fd6..3ea819934f3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java
@@ -65,12 +65,15 @@ public class AnalyzingUtils {
     // --------------------------------------------------------------------------------------------------------------------------
 
     public static String formDebugNameForBindingTrace(@NotNull String debugName, @Nullable Object resolutionSubjectForMessage) {
+        StringBuilder debugInfo = new StringBuilder(debugName);
         if (resolutionSubjectForMessage instanceof PsiElement) {
-            resolutionSubjectForMessage = ((PsiElement) resolutionSubjectForMessage).getText();
+            PsiElement element = (PsiElement) resolutionSubjectForMessage;
+            debugInfo.append(" ").append(element.getText());
+            debugInfo.append(" in ").append(element.getContainingFile().getName());
         }
-        if (resolutionSubjectForMessage != null) {
-            return debugName + " '" + resolutionSubjectForMessage + "'";
+        else if (resolutionSubjectForMessage != null) {
+            debugInfo.append(" ").append(resolutionSubjectForMessage);
         }
-        return debugName;
+        return debugInfo.toString();
     }
 }