Make mixins abstract by default

Change-Id: I8ca672ac9d6acbb29ccea1bd41a617e0a870c74a Reviewed-on: https://dart-review.googlesource.com/76303 Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
flutter · Sep 25, 2018 · a6b1a99 · a6b1a99
1 parent ab305f2
commit a6b1a99
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/pkg/analysis_server/test/plugin/protocol_dart_test.dart b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
@@ -507,7 +507,7 @@ mixin A {}
         expect(location.startColumn, 7);
       }
       expect(element.parameters, isNull);
-      expect(element.flags, 0);
+      expect(element.flags, Element.FLAG_ABSTRACT);
     }
   }
 

diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -6580,6 +6580,9 @@ class MixinElementImpl extends ClassElementImpl {
       UnlinkedClass unlinkedClass, CompilationUnitElementImpl enclosingUnit)
       : super.forSerialized(unlinkedClass, enclosingUnit);
 
+  @override
+  bool get isAbstract => true;
+
   @override
   bool get isMixin => true;
 

diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -2732,7 +2732,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       InstanceCreationExpression expression,
       TypeName typeName,
       InterfaceType type) {
-    if (type.element.isAbstract) {
+    if (type.element.isAbstract && !type.element.isMixin) {
       ConstructorElement element = expression.staticElement;
       if (element != null && !element.isFactory) {
         bool isImplicit =

diff --git a/pkg/analyzer/test/src/dart/resolution/mixin_test.dart b/pkg/analyzer/test/src/dart/resolution/mixin_test.dart
@@ -169,6 +169,10 @@ mixin M {}
     expect(element.typeParameters, isEmpty);
 
     expect(element.supertype, isNull);
+    expect(element.isAbstract, isTrue);
+    expect(element.isEnum, isFalse);
+    expect(element.isMixin, isTrue);
+    expect(element.isMixinApplication, isFalse);
     expect(element.type.isObject, isFalse);
 
     assertElementTypes(element.superclassConstraints, [objectType]);

diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
@@ -169,7 +169,7 @@ class _ElementWriter {
     writeDocumentation(e);
     writeMetadata(e, '', '\n');
 
-    writeIf(e.isAbstract, 'abstract ');
+    writeIf(e.isAbstract && !e.isMixin, 'abstract ');
 
     if (e.isEnum) {
       buffer.write('enum ');