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

Unified Diff: pkg/analyzer/lib/src/summary/resynthesize.dart

Issue 1740923002: Propertly summarize LUB function types. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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/summary/idl.dart ('k') | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/resynthesize.dart
diff --git a/pkg/analyzer/lib/src/summary/resynthesize.dart b/pkg/analyzer/lib/src/summary/resynthesize.dart
index 4f6eb205f2ac629ad52d793f599b6748cd9dd37e..3e5e25594cef4f75a64cf42aed8026c0247a4565 100644
--- a/pkg/analyzer/lib/src/summary/resynthesize.dart
+++ b/pkg/analyzer/lib/src/summary/resynthesize.dart
@@ -1656,17 +1656,19 @@ class _LibraryResynthesizer {
/**
* Resynthesize a [ParameterElement].
*/
- ParameterElement buildParameter(UnlinkedParam serializedParameter) {
+ ParameterElement buildParameter(UnlinkedParam serializedParameter,
+ {bool synthetic: false}) {
ParameterElementImpl parameterElement;
+ int nameOffset = synthetic ? -1 : serializedParameter.nameOffset;
if (serializedParameter.isInitializingFormal) {
FieldFormalParameterElementImpl initializingParameter;
if (serializedParameter.kind == UnlinkedParamKind.required) {
initializingParameter = new FieldFormalParameterElementImpl(
- serializedParameter.name, serializedParameter.nameOffset);
+ serializedParameter.name, nameOffset);
} else {
DefaultFieldFormalParameterElementImpl defaultParameter =
new DefaultFieldFormalParameterElementImpl(
- serializedParameter.name, serializedParameter.nameOffset);
+ serializedParameter.name, nameOffset);
initializingParameter = defaultParameter;
if (serializedParameter.defaultValue != null) {
defaultParameter.constantInitializer =
@@ -1679,12 +1681,12 @@ class _LibraryResynthesizer {
initializingParameter.field = fields[serializedParameter.name];
} else {
if (serializedParameter.kind == UnlinkedParamKind.required) {
- parameterElement = new ParameterElementImpl(
- serializedParameter.name, serializedParameter.nameOffset);
+ parameterElement =
+ new ParameterElementImpl(serializedParameter.name, nameOffset);
} else {
DefaultParameterElementImpl defaultParameter =
new DefaultParameterElementImpl(
- serializedParameter.name, serializedParameter.nameOffset);
+ serializedParameter.name, nameOffset);
parameterElement = defaultParameter;
if (serializedParameter.defaultValue != null) {
defaultParameter.constantInitializer =
@@ -1694,6 +1696,7 @@ class _LibraryResynthesizer {
}
}
}
+ parameterElement.synthetic = synthetic;
buildAnnotations(parameterElement, serializedParameter.annotations);
if (serializedParameter.isFunctionTyped) {
FunctionElementImpl parameterTypeElement =
@@ -1784,6 +1787,17 @@ class _LibraryResynthesizer {
}
if (type.paramReference != 0) {
return getTypeParameterFromScope(type.paramReference);
+ } else if (type.syntheticReturnType != null) {
+ FunctionElementImpl element = new FunctionElementImpl('', -1);
+ element.synthetic = true;
+ element.parameters = type.syntheticParams
+ .map((UnlinkedParam param) => buildParameter(param, synthetic: true))
+ .toList();
+ element.returnType = buildType(type.syntheticReturnType);
+ FunctionTypeImpl result = new FunctionTypeImpl.elementWithNameAndArgs(
+ element, null, null, false);
+ element.type = result;
+ return result;
} else {
DartType getTypeArgument(int i) {
if (i < type.typeArguments.length) {
« no previous file with comments | « pkg/analyzer/lib/src/summary/idl.dart ('k') | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698