editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java - Issue 493363007: Fixes for comments in CL 474193003

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java

Issue 493363007: Fixes for comments in CL 474193003 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 4 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

« editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/AnalysisOptions.java ('K') | « editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/SearchResult.java ('k') | pkg/analysis_server/tool/spec/codegen_java_types.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java

diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java

index d7d3a0b643590c632972144f91d4c3e2e16f0b15..0d459d187c85e7f53f208863e835613d40b8cad1 100644

--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java

+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/OverrideIndicatorManager.java

@@ -317,7 +317,8 @@ public class OverrideIndicatorManager {

Map<Annotation, Position> annotationMap = Maps.newHashMap();

for (OverrideMember override : overrides) {

boolean isOverride = true;

- com.google.dart.server.generated.types.Element superElement = override.getSuperclassMember().getElement();

+ com.google.dart.server.generated.types.Element superElement = override.getSuperclassMember() != null

+ ? override.getSuperclassMember().getElement() : null;

// TODO(scheglov) shouldn't happen, probably because of "implements X"

if (superElement == null) {

continue;