Implement new-style mixin support for Dart 2.1 #1765
Conversation
.travis.yml
Outdated
| @@ -2,7 +2,6 @@ language: dart | |||
| sudo: false | |||
| dart: | |||
| - "dev/raw/latest" | |||
| - stable | |||
There was a problem hiding this comment.
We may not need to omit this; I think at least the analyzer would be happy with both 2.01 and 2.1, but your call here.
There was a problem hiding this comment.
Restored testing with stable, as it seems to work.
|
@bwilkerson, can you review this? |
|
Reenabled stable tests in travis and changed version range to allow 2.0. We still require a version override due to dart-lang/build#1873 but we can hack around that to publish. |
…ides to make travis green
lib/src/model.dart
Outdated
| @@ -2681,7 +2776,11 @@ abstract class ModelElement extends Canonicalization | |||
| // Also handles enums | |||
| if (e is ClassElement) { | |||
| if (!e.isEnum) { | |||
| newModelElement = new Class(e, library, packageGraph); | |||
| if (e is MixinElementImpl) { | |||
There was a problem hiding this comment.
"e is MixinElementImpl" --> "e.isMixin"
Also, this would look cleaner to me as
if (e.isMixin) {
} else if (e.isEnum) {
} else {
}
lib/src/model.dart
Outdated
| AstNode get astNode { | ||
| if (_astNode == null) { | ||
| _astNode = element?.computeNode(); | ||
| } |
There was a problem hiding this comment.
Or replace the 'if' with "_astNode ??= element?.computeNode();"
lib/src/model.dart
Outdated
| @@ -3314,12 +3441,14 @@ abstract class ModelElement extends Canonicalization | |||
| @override | |||
| String get name => element.name; | |||
|
|
|||
| // TODO(jcollins-g): refactor once mixins can call super | |||
There was a problem hiding this comment.
If by "mixins" you mean mixin declarations, they already can call super (as long as the invoked method is defined by a superclass constraint).
There was a problem hiding this comment.
Clarified to make it clear that we have to go to Dart 2.1+ only to refactor this code. Head dartdoc still can run on Dart 2.0.
Fixes #1752, #1778, #1779.
This drops support for Dart 2.0.
As a side effect of this change, type inference is more accurate for deep inheritance cases and class members are more likely to correctly pick up documentation from superclasses. Additionally, some warnings WRT comment references inherited from superclasses referencing renamed type and parameter variables in subclasses were accidentally suppressed, and are not suppressed anymore (approximately doubling the raw number of warnings in the flutter repository).
Obligatory screenshots:
and: