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

Unified Diff: pkg/analyzer/lib/src/generated/incremental_resolver.dart

Issue 995853002: Fix for matching field formal parameters. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 9 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 | « no previous file | pkg/analyzer/test/generated/incremental_resolver_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/incremental_resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/incremental_resolver.dart b/pkg/analyzer/lib/src/generated/incremental_resolver.dart
index 4a456199214ffed0ab3652516e44600d95fbff87..5832ef8365a03e585f38a8e9443e5d68d8ca46f2 100644
--- a/pkg/analyzer/lib/src/generated/incremental_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/incremental_resolver.dart
@@ -472,14 +472,18 @@ class DeclarationMatcher extends RecursiveAstVisitor {
} else {
_assertEquals(nodeDefault.toSource(), element.defaultValueCode);
}
+ _assertCompatibleParameter(node.parameter, element);
} else if (node is FieldFormalParameter) {
_assertTrue(element.isInitializingFormal);
+ _assertCompatibleParameters(node.parameters, element.parameters);
} else if (node is FunctionTypedFormalParameter) {
+ _assertFalse(element.isInitializingFormal);
_assertTrue(element.type is FunctionType);
FunctionType elementType = element.type;
_assertCompatibleParameters(node.parameters, element.parameters);
_assertSameType(node.returnType, elementType.returnType);
} else if (node is SimpleFormalParameter) {
+ _assertFalse(element.isInitializingFormal);
_assertSameType(node.type, element.type);
}
}
@@ -1250,7 +1254,8 @@ class PoorMansIncrementalResolver {
}
// fail if a comment change outside the bodies
if (firstPair.kind == _TokenDifferenceKind.COMMENT) {
- if (beginOffsetOld <= oldNode.offset || beginOffsetNew <= newNode.offset) {
+ if (beginOffsetOld <= oldNode.offset ||
+ beginOffsetNew <= newNode.offset) {
logger.log('Failure: comment outside a function body.');
return false;
}
« no previous file with comments | « no previous file | pkg/analyzer/test/generated/incremental_resolver_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698