Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: pkg/analyzer/lib/src/task/strong_mode.dart

Issue 2352433002: support `@virtual` fields, fix #27384 (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analyzer/lib/src/task/strong/checker.dart ('k') | pkg/analyzer/test/src/task/strong/checker_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/task/strong_mode.dart
diff --git a/pkg/analyzer/lib/src/task/strong_mode.dart b/pkg/analyzer/lib/src/task/strong_mode.dart
index 93de3ddc149720040ab4d85b7ea7ae86b558f031..37c91cf143290fa66cdbeea7165e29d2cb94e56d 100644
--- a/pkg/analyzer/lib/src/task/strong_mode.dart
+++ b/pkg/analyzer/lib/src/task/strong_mode.dart
@@ -306,11 +306,7 @@ class InstanceMemberInferrer {
for (int i = 0; i < length; ++i) {
ParameterElement parameter = parameters[i];
if (parameter is ParameterElementImpl) {
- // If a parameter is covariant, any parameters that override it are too.
- parameter.inheritsCovariant = overriddenTypes.any((f) {
- var param = _getCorrespondingParameter(parameter, i, f.parameters);
- return param != null && param.isCovariant;
- });
+ _inferParameterCovariance(parameter, i, overriddenTypes);
if (parameter.hasImplicitType) {
parameter.type = _computeParameterType(parameter, i, overriddenTypes);
@@ -327,9 +323,19 @@ class InstanceMemberInferrer {
* which no type was provided, infer the type of the field.
*/
void _inferField(FieldElement fieldElement) {
- if (!fieldElement.isSynthetic &&
- !fieldElement.isStatic &&
- fieldElement.hasImplicitType) {
+ if (fieldElement.isSynthetic || fieldElement.isStatic) {
+ return;
+ }
+ List<ExecutableElement> overriddenSetters =
+ inheritanceManager.lookupOverrides(
+ fieldElement.enclosingElement, fieldElement.name + '=');
+ var setter = fieldElement.setter;
+ if (setter != null && overriddenSetters.isNotEmpty) {
+ _inferParameterCovariance(
+ setter.parameters[0], 0, overriddenSetters.map((s) => s.type));
+ }
+
+ if (fieldElement.hasImplicitType) {
//
// First look for overridden getters with the same name as the field.
//
@@ -339,9 +345,7 @@ class InstanceMemberInferrer {
if (overriddenGetters.isNotEmpty && _onlyGetters(overriddenGetters)) {
newType =
_computeReturnType(overriddenGetters.map((e) => e.returnType));
- List<ExecutableElement> overriddenSetters =
- inheritanceManager.lookupOverrides(
- fieldElement.enclosingElement, fieldElement.name + '=');
+
if (!_isCompatible(newType, overriddenSetters)) {
newType = null;
}
@@ -376,6 +380,17 @@ class InstanceMemberInferrer {
}
/**
+ * If a parameter is covariant, any parameters that override it are too.
+ */
+ void _inferParameterCovariance(ParameterElementImpl parameter, int index,
+ Iterable<FunctionType> overriddenTypes) {
+ parameter.inheritsCovariant = overriddenTypes.any((f) {
+ var param = _getCorrespondingParameter(parameter, index, f.parameters);
+ return param != null && param.isCovariant;
+ });
+ }
+
+ /**
* Infer type information for all of the instance members in the given
* interface [type].
*/
« no previous file with comments | « pkg/analyzer/lib/src/task/strong/checker.dart ('k') | pkg/analyzer/test/src/task/strong/checker_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698