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

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

Issue 882203002: Fix for two semantic highlighting problems. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartEditor.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartEditor.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartEditor.java
index f9c6052e9258a41bc22c1e7c5d695be27659ede9..926ba084c37ff05e0a9626695391aca450e2c507 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartEditor.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartEditor.java
@@ -2933,6 +2933,8 @@ public abstract class DartEditor extends AbstractDecoratedTextEditor implements
@Override
protected void doSetInput(IEditorInput input) throws CoreException {
+ inputResourceFile = null;
+ inputJavaFile = null;
if (input instanceof IFileEditorInput) {
IFileEditorInput fileInput = (IFileEditorInput) input;
inputResourceFile = fileInput.getFile();
@@ -2947,6 +2949,8 @@ public abstract class DartEditor extends AbstractDecoratedTextEditor implements
}
}
+ uninstallSemanticHighlighting();
+
// TODO(scheglov) This code is intentionally left commented.
// If we don't follow the "!(sourceViewer instanceof ISourceViewerExtension2)",
// it causes https://code.google.com/p/dart/issues/detail?id=18297
@@ -2957,7 +2961,6 @@ public abstract class DartEditor extends AbstractDecoratedTextEditor implements
internalDoSetInput(input);
}
- uninstallSemanticHighlighting();
installSemanticHighlighting();
// ISourceViewer sourceViewer = getSourceViewer();
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698