editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java - Issue 15029010: Remove CTEC.MIXIN_OF_NON_MIXIN and MIXIN_WITH_NON_CLASS_SUPERCLASS.

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.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java

Issue 15029010: Remove CTEC.MIXIN_OF_NON_MIXIN and MIXIN_WITH_NON_CLASS_SUPERCLASS. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Report MIXIN_WITH_NON_CLASS_SUPERCLASS Created 7 years, 7 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 | « editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java ('k') | editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java

diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java

index 74d771a469f0258e50ebcaf8dc1abe72e6d05338..c09ee0ff1217e3f127fa3927edfd3eddc5729395 100644

--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java

+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/TypeResolverVisitor.java

@@ -166,9 +166,9 @@ public class TypeResolverVisitor extends ScopedVisitor {

InterfaceType superclassType = null;

ExtendsClause extendsClause = node.getExtendsClause();

if (extendsClause != null) {

- superclassType = resolveType(

- extendsClause.getSuperclass(),

- CompileTimeErrorCode.EXTENDS_NON_CLASS);

+ ErrorCode errorCode = node.getWithClause() == null ? CompileTimeErrorCode.EXTENDS_NON_CLASS

+ : CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS;

+ superclassType = resolveType(extendsClause.getSuperclass(), errorCode);

if (superclassType != getTypeProvider().getObjectType()) {

classElement.setValidMixin(false);

}

@@ -193,7 +193,7 @@ public class TypeResolverVisitor extends ScopedVisitor {

ClassElementImpl classElement = getClassElement(node.getName());

InterfaceType superclassType = resolveType(

node.getSuperclass(),

- CompileTimeErrorCode.EXTENDS_NON_CLASS);

+ CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS);

if (superclassType == null) {

superclassType = getTypeProvider().getObjectType();

}