Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Unified Diff: compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java

Issue 9968091: Issue 2420. Better error message for 'duplicate top-level definition' (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
index d86425409359965336a33d7fd1d6d0a07076f658..e743e191a3458d7f314a4d1f3f1fbd15de7a1cd0 100644
--- a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
@@ -112,20 +112,18 @@ public class TopLevelElementBuilder {
}
}
// Report two duplicate for both old/new nodes.
- reportDuplicateDeclaration(listener, oldElement);
- reportDuplicateDeclaration(listener, newElement);
+ reportDuplicateDeclaration(listener, oldElement, newElement);
+ reportDuplicateDeclaration(listener, newElement, oldElement);
}
}
/**
- * Reports {@link ResolverErrorCode#DUPLICATE_TOP_LEVEL_DEFINITION} for given named element.
+ * Reports {@link ResolverErrorCode#DUPLICATE_TOP_LEVEL_DECLARATION} for given named element.
*/
- private void reportDuplicateDeclaration(DartCompilerListener listener, Element element) {
- compilationError(
- listener,
- element.getNameLocation(),
- ResolverErrorCode.DUPLICATE_TOP_LEVEL_DEFINITION,
- element.getName());
+ private void reportDuplicateDeclaration(DartCompilerListener listener, Element element,
+ Element otherElement) {
+ compilationError(listener, element.getNameLocation(), ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION,
+ otherElement, Elements.getRelativeElementLocation(element, otherElement));
}
/**

Powered by Google App Engine
This is Rietveld 408576698