Skip to content

Put late before final in feature sorting #2608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2021
Merged

Put late before final in feature sorting #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/model/feature.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class Feature implements Privacy {
// TODO(jcollins-g): consider [Comparable]?
final int sortGroup;

static const lateFeature = Feature('late', 1);
static const readOnly = Feature('read-only', 1);
static const finalFeature = Feature('final', 2);
static const writeOnly = Feature('write-only', 2);
Expand All @@ -56,7 +57,6 @@ class Feature implements Privacy {
static const inherited = Feature('inherited', 3);
static const inheritedGetter = Feature('inherited-getter', 3);
static const inheritedSetter = Feature('inherited-setter', 3);
static const lateFeature = Feature('late', 3);
static const overrideFeature = Feature('override', 3);
static const overrideGetter = Feature('override-getter', 3);
static const overrideSetter = Feature('override-setter', 3);
Expand Down
2 changes: 1 addition & 1 deletion lib/src/model/getter_setter_combo.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ mixin GetterSetterCombo on ModelElement {
if (hasExplicitSetter && hasPublicSetter) ...setter.features,
if (readOnly && !isFinal && !isConst) Feature.readOnly,
if (writeOnly) Feature.writeOnly,
if (readWrite) Feature.readWrite,
if (readWrite && !isLate) Feature.readWrite,
};

@override
Expand Down
5 changes: 5 additions & 0 deletions test/end2end/model_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,22 @@ void main() {
expect(a.modelType.name, equals('dynamic'));
expect(a.isLate, isTrue);
expect(a.features, contains(Feature.lateFeature));
expect(a.features, isNot(contains(Feature.readWrite)));

expect(b.modelType.name, equals('int'));
expect(b.isLate, isTrue);
expect(b.features, contains(Feature.lateFeature));
expect(b.features, isNot(contains(Feature.readWrite)));

expect(cField.modelType.name, equals('dynamic'));
expect(cField.isLate, isTrue);
expect(cField.features, contains(Feature.lateFeature));
expect(cField.features, isNot(contains(Feature.readWrite)));

expect(dField.modelType.name, equals('double'));
expect(dField.isLate, isTrue);
expect(dField.features, contains(Feature.lateFeature));
expect(dField.features, isNot(contains(Feature.readWrite)));
});

test('Late final top level variables', () {
Expand All @@ -239,6 +243,7 @@ void main() {
expect(initializeMe.modelType.name, equals('String'));
expect(initializeMe.isLate, isTrue);
expect(initializeMe.features, contains(Feature.lateFeature));
expect(initializeMe.features, isNot(contains(Feature.readWrite)));
});

test('Opt out of Null safety', () {
Expand Down