Skip to content

Commit 2175dd0

Browse files
authored
Stop using old-style supermixin syntax. (#1794)
* Disable supermixins * Avoid old-style supermixins while maintaining Dart 2.0 compatible * Enable stable again
1 parent 16b6c84 commit 2175dd0

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

analysis_options.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
analyzer:
2-
language:
3-
enableSuperMixins: true
42
exclude:
53
- 'doc/**'
64
- 'lib/src/third_party/pkg/**'

lib/src/model.dart

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,9 +1377,8 @@ abstract class Categorization implements ModelElement {
13771377
}
13781378

13791379
/// Classes extending this class have canonicalization support in Dartdoc.
1380-
abstract class Canonicalization extends Object
1381-
with Locatable
1382-
implements Documentable {
1380+
abstract class Canonicalization
1381+
implements Locatable, Documentable {
13831382
bool get isCanonical;
13841383
Library get canonicalLibrary;
13851384

@@ -5272,7 +5271,7 @@ class PackageGraph {
52725271
/// accessing private member variables. Do not call any methods or members
52735272
/// excepting [name] and the private Lists below before finishing initialization
52745273
/// of a [TopLevelContainer].
5275-
abstract class TopLevelContainer extends Nameable {
5274+
abstract class TopLevelContainer implements Nameable {
52765275
List<Class> _classes;
52775276
List<Enum> _enums;
52785277
List<Mixin> _mixins;
@@ -5317,8 +5316,8 @@ abstract class TopLevelContainer extends Nameable {
53175316
/// A set of libraries, initialized after construction by accessing [_libraries].
53185317
/// Do not cache return values of any methods or members excepting [_libraries]
53195318
/// and [name] before finishing initialization of a [LibraryContainer].
5320-
abstract class LibraryContainer extends Nameable
5321-
implements Comparable<LibraryContainer> {
5319+
abstract class LibraryContainer
5320+
implements Nameable, Comparable<LibraryContainer> {
53225321
final List<Library> _libraries = [];
53235322
List<Library> get libraries => _libraries;
53245323

@@ -5587,7 +5586,7 @@ enum DocumentLocation {
55875586
/// A [LibraryContainer] that contains [Library] objects related to a particular
55885587
/// package.
55895588
class Package extends LibraryContainer
5590-
with Locatable, Canonicalization, Warnable
5589+
with Nameable, Locatable, Canonicalization, Warnable
55915590
implements Privacy, Documentable {
55925591
String _name;
55935592
PackageGraph _packageGraph;
@@ -6051,7 +6050,7 @@ abstract class TypeParameters implements ModelElement {
60516050

60526051
/// Top-level variables. But also picks up getters and setters?
60536052
class TopLevelVariable extends ModelElement
6054-
with GetterSetterCombo, SourceCodeMixin, Categorization
6053+
with Canonicalization, GetterSetterCombo, SourceCodeMixin, Categorization
60556054
implements EnclosedElement {
60566055
@override
60576056
final Accessor getter;

test/model_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'package:test/test.dart';
1616
import 'src/utils.dart' as utils;
1717

1818
/// For testing sort behavior.
19-
class TestLibraryContainer extends LibraryContainer {
19+
class TestLibraryContainer extends LibraryContainer with Nameable{
2020
@override
2121
final List<String> containerOrder;
2222
@override

0 commit comments

Comments
 (0)