Chromium Code Reviews| 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 acd47892a444250536510fdda020a12d1f7eb134..ef96bd087234427e25200ca5d1274b5562edc83b 100644 |
| --- a/pkg/analyzer/lib/src/generated/resolver.dart |
| +++ b/pkg/analyzer/lib/src/generated/resolver.dart |
| @@ -11567,7 +11567,7 @@ class TypeResolverVisitor extends ScopedVisitor { |
| if (element is MultiplyDefinedElement) { |
| _setElement(typeName, element); |
| } else { |
| - _setElement(typeName, _dynamicType.element); |
| + _setElement(typeName, null); |
| } |
| typeName.staticType = _undefinedType; |
| node.type = _undefinedType; |
| @@ -11632,7 +11632,7 @@ class TypeResolverVisitor extends ScopedVisitor { |
| StaticWarningCode.NOT_A_TYPE, typeName, [typeName.name]); |
| } |
| } |
| - _setElement(typeName, _dynamicType.element); |
| + _setElement(typeName, null); |
| typeName.staticType = _dynamicType; |
| node.type = _dynamicType; |
| return null; |
| @@ -12135,17 +12135,18 @@ class TypeResolverVisitor extends ScopedVisitor { |
| } |
| void _setElement(Identifier typeName, Element element) { |
|
Brian Wilkerson
2016/02/16 19:32:18
It's kind of ugly (and probably ought to be docume
scheglov
2016/02/16 19:56:13
Done.
|
| - if (element != null) { |
| - if (typeName is SimpleIdentifier) { |
| + if (typeName is SimpleIdentifier) { |
| + if (element != null) { |
| typeName.staticElement = element; |
| - } else if (typeName is PrefixedIdentifier) { |
| - PrefixedIdentifier identifier = typeName; |
| - identifier.identifier.staticElement = element; |
| - SimpleIdentifier prefix = identifier.prefix; |
| - Element prefixElement = nameScope.lookup(prefix, definingLibrary); |
| - if (prefixElement != null) { |
| - prefix.staticElement = prefixElement; |
| - } |
| + } |
| + } else if (typeName is PrefixedIdentifier) { |
| + if (element != null) { |
| + typeName.identifier.staticElement = element; |
| + } |
| + SimpleIdentifier prefix = typeName.prefix; |
| + Element prefixElement = nameScope.lookup(prefix, definingLibrary); |
| + if (prefixElement != null) { |
| + prefix.staticElement = prefixElement; |
| } |
| } |
| } |