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

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

Issue 1445273002: Revert "Use FunctionElementImpl for inline function type parameters" (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month 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/element.dart ('k') | pkg/analyzer/test/generated/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/resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index ad1cd606e01da266f2beca48b84da5c9a984955c..b1709e6dbf387e0d865312fade23bb0393977153 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -14939,12 +14939,33 @@ class TypeResolverVisitor extends ScopedVisitor {
void _setFunctionTypedParameterType(ParameterElementImpl element,
TypeName returnType, FormalParameterList parameterList) {
List<ParameterElement> parameters = _getElements(parameterList);
- FunctionElementImpl functionElement = new FunctionElementImpl.forNode(null);
- functionElement.synthetic = true;
- functionElement.shareParameters(parameters);
- functionElement.returnType = _computeReturnType(returnType);
- functionElement.enclosingElement = element;
- element.type = new FunctionTypeImpl(functionElement);
+ FunctionTypeAliasElementImpl aliasElement =
+ new FunctionTypeAliasElementImpl.forNode(null);
+ aliasElement.synthetic = true;
+ aliasElement.shareParameters(parameters);
+ aliasElement.returnType = _computeReturnType(returnType);
+ // FunctionTypeAliasElementImpl assumes the enclosing element is a
+ // CompilationUnitElement (because non-synthetic function types can only be
+ // declared at top level), so to avoid breaking things, go find the
+ // compilation unit element.
+ aliasElement.enclosingElement =
+ element.getAncestor((element) => element is CompilationUnitElement);
+ ClassElement definingClass =
+ element.getAncestor((element) => element is ClassElement);
+ if (definingClass != null) {
+ aliasElement.shareTypeParameters(definingClass.typeParameters);
+ } else {
+ FunctionTypeAliasElement alias =
+ element.getAncestor((element) => element is FunctionTypeAliasElement);
+ while (alias != null && alias.isSynthetic) {
+ alias =
+ alias.getAncestor((element) => element is FunctionTypeAliasElement);
+ }
+ if (alias != null) {
+ aliasElement.typeParameters = alias.typeParameters;
+ }
+ }
+ element.type = new FunctionTypeImpl.forTypedef(aliasElement);
}
/**
« no previous file with comments | « pkg/analyzer/lib/src/generated/element.dart ('k') | pkg/analyzer/test/generated/resolver_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698