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

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

Issue 2230513002: fix #26155 - optional param passed to positional was not inferred (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: add comment Created 4 years, 4 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/generated/resolver.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/generated/static_type_analyzer.dart
diff --git a/pkg/analyzer/lib/src/generated/static_type_analyzer.dart b/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
index fa82560e055276642182e1a99c6336ffe21b0717..43b0f18c908fc520c08bfa777b8ff2b629518784 100644
--- a/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
+++ b/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
@@ -131,29 +131,15 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<Object> {
}
List<ParameterElement> parameters = node.parameterElements;
-
- {
- List<DartType> normalParameterTypes = functionType.normalParameterTypes;
- int normalCount = normalParameterTypes.length;
- Iterable<ParameterElement> required = parameters
- .where((p) => p.parameterKind == ParameterKind.REQUIRED)
- .take(normalCount);
- int index = 0;
- for (ParameterElementImpl p in required) {
- inferType(p, normalParameterTypes[index++]);
- }
- }
-
{
- List<DartType> optionalParameterTypes =
- functionType.optionalParameterTypes;
- int optionalCount = optionalParameterTypes.length;
- Iterable<ParameterElement> optional = parameters
- .where((p) => p.parameterKind == ParameterKind.POSITIONAL)
- .take(optionalCount);
- int index = 0;
- for (ParameterElementImpl p in optional) {
- inferType(p, optionalParameterTypes[index++]);
+ Iterator<ParameterElement> positional = parameters
+ .where((p) => p.parameterKind != ParameterKind.NAMED)
+ .iterator;
+ Iterator<ParameterElement> fnPositional = functionType.parameters
+ .where((p) => p.parameterKind != ParameterKind.NAMED)
+ .iterator;
+ while (positional.moveNext() && fnPositional.moveNext()) {
+ inferType(positional.current, fnPositional.current.type);
}
}
@@ -1697,6 +1683,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<Object> {
visitedClasses.remove(element);
}
}
+
if (type is InterfaceType) {
_find(type);
}
« no previous file with comments | « pkg/analyzer/lib/src/generated/resolver.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