From 473779befa862a04c4d85cf5cd8873626f65183b Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Fri, 28 Oct 2011 23:11:14 +0400
Subject: [PATCH] Redeclarations now report the redeclared name

---
 .../jet/lang/diagnostics/RedeclarationDiagnostic.java       | 6 +++---
 .../lang/diagnostics/RedeclarationDiagnosticFactory.java    | 4 ++--
 .../jet/lang/resolve/TraceBasedRedeclarationHandler.java    | 2 +-
 .../org/jetbrains/jet/plugin/annotations/JetPsiChecker.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
index 9092b9edf19..3a8c2f02733 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
@@ -15,8 +15,8 @@ import static org.jetbrains.jet.lang.diagnostics.Severity.ERROR;
 public interface RedeclarationDiagnostic extends DiagnosticWithPsiElement<PsiElement> {
     public class SimpleRedeclarationDiagnostic extends DiagnosticWithPsiElementImpl<PsiElement> implements RedeclarationDiagnostic {
 
-        public SimpleRedeclarationDiagnostic(@NotNull PsiElement psiElement) {
-            super(RedeclarationDiagnosticFactory.INSTANCE, ERROR, "Redeclaration", psiElement);
+        public SimpleRedeclarationDiagnostic(@NotNull PsiElement psiElement, @NotNull String name) {
+            super(RedeclarationDiagnosticFactory.INSTANCE, ERROR, "Redeclaration: " + name, psiElement);
         }
     }
 
@@ -66,7 +66,7 @@ public interface RedeclarationDiagnostic extends DiagnosticWithPsiElement<PsiEle
         @NotNull
         @Override
         public String getMessage() {
-            return "Redeclaration";
+            return "Redeclaration: " + duplicatingDescriptor.getName();
         }
 
         @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
index c9303288d18..bb12b9bfff3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
@@ -16,8 +16,8 @@ public class RedeclarationDiagnosticFactory extends AbstractDiagnosticFactory {
 
     public RedeclarationDiagnosticFactory() {}
 
-    public RedeclarationDiagnostic on(@NotNull PsiElement duplicatingElement) {
-        return new RedeclarationDiagnostic.SimpleRedeclarationDiagnostic(duplicatingElement);
+    public RedeclarationDiagnostic on(@NotNull PsiElement duplicatingElement, @NotNull String name) {
+        return new RedeclarationDiagnostic.SimpleRedeclarationDiagnostic(duplicatingElement, name);
     }
 
     public Diagnostic on(DeclarationDescriptor duplicatingDescriptor, BindingContext contextToResolveToDeclaration) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java
index 299b6f63455..36d7edc0328 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java
@@ -26,7 +26,7 @@ public class TraceBasedRedeclarationHandler implements RedeclarationHandler {
     private void report(DeclarationDescriptor first) {
         PsiElement firstElement = trace.get(BindingContext.DESCRIPTOR_TO_DECLARATION, first);
         if (firstElement != null) {
-            trace.report(REDECLARATION.on(firstElement));
+            trace.report(REDECLARATION.on(firstElement, first.getName()));
         }
         else {
             trace.report(REDECLARATION.on(first, trace.getBindingContext()));
diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
index 6272bae35b2..34ae7bf85ea 100644
--- a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
+++ b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
@@ -60,7 +60,7 @@ public class JetPsiChecker implements Annotator {
                     Collection<Diagnostic> diagnostics = Sets.newLinkedHashSet(bindingContext.getDiagnostics());
                     Set<PsiElement> redeclarations = Sets.newHashSet();
                     for (Diagnostic diagnostic : diagnostics) {
-                        if (diagnostic.getFactory().getPsiFile(diagnostic) != file) continue;
+                        if (diagnostic.getFactory().getPsiFile(diagnostic) != file) continue; // This is needed because we have the same context for all files
                         Annotation annotation = null;
                         if (diagnostic.getSeverity() == Severity.ERROR) {
                             if (diagnostic instanceof UnresolvedReferenceDiagnostic) {