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

Unified Diff: pkg/analyzer/lib/src/generated/error.dart

Issue 1040573002: Fix NPE in ErrorReporter (issue 22980) (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 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
« no previous file with comments | « no previous file | pkg/analyzer/test/generated/all_the_rest_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/error.dart
diff --git a/pkg/analyzer/lib/src/generated/error.dart b/pkg/analyzer/lib/src/generated/error.dart
index 6ba42dced43df8486232464928071580cc8dc523..9ff7fa198c1c0e91302541dd4adca964eb101b9c 100644
--- a/pkg/analyzer/lib/src/generated/error.dart
+++ b/pkg/analyzer/lib/src/generated/error.dart
@@ -2474,8 +2474,16 @@ class ErrorReporter {
*/
void reportErrorForElement(
ErrorCode errorCode, Element element, List<Object> arguments) {
- reportErrorForOffset(
- errorCode, element.nameOffset, element.displayName.length, arguments);
+ String displayName = element.displayName;
+ int length = 0;
+ if (displayName != null) {
+ length = displayName.length;
+ } else if (element is ImportElement) {
+ length = 6; // 'import'.length
+ } else if (element is ExportElement) {
+ length = 6; // 'export'.length
+ }
+ reportErrorForOffset(errorCode, element.nameOffset, length, arguments);
}
/**
« no previous file with comments | « no previous file | pkg/analyzer/test/generated/all_the_rest_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698