Skip to content

Override modelType to match return type in TypeParameters interface #1755

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 3 commits into from
Sep 17, 2018
Merged

Override modelType to match return type in TypeParameters interface #1755

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3c55ff
Override modelType to match return type in TypeParameters interface
askeksa Sep 12, 2018
13933a3
Merge branch 'master' into element_type
jcollins-g Sep 17, 2018
ad4e910
Merge branch 'master' into element_type
jcollins-g Sep 17, 2018
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
15 changes: 15 additions & 0 deletions lib/src/model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,9 @@ class Class extends ModelElement

Iterable<DefinedElementType> get publicMixins => filterNonPublic(mixins);

@override
DefinedElementType get modelType => super.modelType;

List<Operator> get operators {
if (_operators != null) return _operators;
_operators = _methods
Expand Down Expand Up @@ -1111,6 +1114,9 @@ class Constructor extends ModelElement
@override
String get kind => 'constructor';

@override
DefinedElementType get modelType => super.modelType;

String _name;
@override
String get name {
Expand Down Expand Up @@ -2484,6 +2490,9 @@ class Method extends ModelElement

String get linkedReturnType => modelType.createLinkedReturnTypeName();

@override
DefinedElementType get modelType => super.modelType;

@override
Method get overriddenElement {
ClassElement parent = element.enclosingElement;
Expand Down Expand Up @@ -4038,6 +4047,9 @@ class ModelFunctionTyped extends ModelElement
// Food for mustache. TODO(jcollins-g): what about enclosing elements?
bool get isInherited => false;

@override
DefinedElementType get modelType => super.modelType;

FunctionTypedElement get _func => (element as FunctionTypedElement);
}

Expand Down Expand Up @@ -5806,6 +5818,9 @@ class Typedef extends ModelElement

String get linkedReturnType => modelType.createLinkedReturnTypeName();

@override
DefinedElementType get modelType => super.modelType;

FunctionTypeAliasElement get _typedef =>
(element as FunctionTypeAliasElement);

Expand Down