editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartCodeScanner.java - Issue 11776037: Initial support for mixins in dartc.

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/dart/DartCodeScanner.java

Issue 11776037: Initial support for mixins in dartc. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Forgot MixinScope.java Created 7 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

« editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/bindings/BindingUtils.java ('K') | « editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/bindings/BindingUtilsTest.java ('k') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/SemanticHighlightingReconciler.java » ('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/dart/DartCodeScanner.java

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

index a6ab34aeb5992467e7b4860cb8fc4627bf5840fe..9584d605b11dff868e3c64b889c50f032f1bf66a 100644

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

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

@@ -31,7 +31,7 @@ import static com.google.dart.compiler.parser.Token.BREAK;

import static com.google.dart.compiler.parser.Token.IS;

import static com.google.dart.compiler.parser.Token.LIBRARY;

import static com.google.dart.compiler.parser.Token.NATIVE;

-import static com.google.dart.compiler.parser.Token.WHILE;

+import static com.google.dart.compiler.parser.Token.WITH;

import org.eclipse.jface.preference.IPreferenceStore;

import org.eclipse.jface.text.rules.ICharacterScanner;

@@ -240,7 +240,7 @@ public class DartCodeScanner extends AbstractDartScanner {

for (int i = 0; i < tokens.length; i++) {

com.google.dart.compiler.parser.Token token = tokens[i];

- if ((BREAK.ordinal() <= token.ordinal() && token.ordinal() <= WHILE.ordinal())

+ if ((BREAK.ordinal() <= token.ordinal() && token.ordinal() <= WITH.ordinal())

|| token.ordinal() == AS.ordinal() || token.ordinal() == IS.ordinal()) {

keywords.add(token.getSyntax());

}