| commit | f9b68f72f480d66c29602624a63e29cb7ca97058 | [log] [tgz] |
|---|---|---|
| author | Konstantin Shcheglov <scheglov@google.com> | Fri May 03 14:10:23 2019 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org> | Fri May 03 14:10:23 2019 +0000 |
| tree | 676deb8fb0af73e40a936d513d45f19ab3bb6d1b | |
| parent | 0130ffed1ba78535df19ff9cd7e05ef8969f9aa3 [diff] |
Fix copy-paste error with optionalNamed. R=brianwilkerson@google.com Change-Id: Ic657a6af242a4a279772f746aabc1c2596cfa904 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101201 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart index 7d7cb1e..a04e0f5 100644 --- a/pkg/analyzer/lib/src/dart/element/element.dart +++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -8173,6 +8173,10 @@ @override String get defaultValueCode { + if (linkedNode != null) { + return linkedContext.getDefaultValueCode(linkedNode); + } + if (unlinkedParam != null) { if (unlinkedParam.initializer?.bodyExpr == null) { return null;
diff --git a/pkg/analyzer/lib/src/summary2/linked_unit_context.dart b/pkg/analyzer/lib/src/summary2/linked_unit_context.dart index b32ee0c..ee083b1 100644 --- a/pkg/analyzer/lib/src/summary2/linked_unit_context.dart +++ b/pkg/analyzer/lib/src/summary2/linked_unit_context.dart
@@ -227,6 +227,14 @@ return LazyTypeParameter.getDefaultType(_astReader, node); } + String getDefaultValueCode(AstNode node) { + if (node is DefaultFormalParameter) { + LazyFormalParameter.readDefaultValue(_astReader, node); + return node.defaultValue?.toString(); + } + return null; + } + int getDirectiveOffset(AstNode node) { LazyDirective.readMetadata(_astReader, node); return node.offset;
diff --git a/pkg/analyzer/lib/src/summary2/linking_bundle_context.dart b/pkg/analyzer/lib/src/summary2/linking_bundle_context.dart index 75e6617..fd4148c 100644 --- a/pkg/analyzer/lib/src/summary2/linking_bundle_context.dart +++ b/pkg/analyzer/lib/src/summary2/linking_bundle_context.dart
@@ -130,7 +130,7 @@ } else if (p.isOptionalPositional) { return LinkedNodeFormalParameterKind.optionalPositional; } else if (p.isOptionalNamed) { - return LinkedNodeFormalParameterKind.requiredNamed; + return LinkedNodeFormalParameterKind.optionalNamed; } else { throw StateError('Unexpected parameter kind: $p'); }