languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 12:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Legacy. Update TypePropertyResolver.

Browse source 
Change-Id: Ia35e1c388102d34874e429afac7ad1720871e429
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/350402
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2024-02-05 22:19:57 +00:00 committed by Commit Queue
parent 8338fc2eac
commit 8473e65472
1 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
View file

@ -21,7 +21,6 @@ import 'package:analyzer/src/generated/resolver.dart';
class TypePropertyResolver {
final ResolverVisitor _resolver;
final LibraryElement _definingLibrary;
final bool _isNonNullableByDefault;
final TypeSystemImpl _typeSystem;
final TypeProviderImpl _typeProvider;
final ExtensionMemberResolver _extensionResolver;
@ -42,7 +41,6 @@ class TypePropertyResolver {
TypePropertyResolver(this._resolver)
: _definingLibrary = _resolver.definingLibrary,
_isNonNullableByDefault = true,
_typeSystem = _resolver.typeSystem,
_typeProvider = _resolver.typeProvider,
_extensionResolver = _resolver.extensionResolver;
@ -72,8 +70,6 @@ class TypePropertyResolver {
_nameErrorEntity = nameErrorEntity;
_resetResult();
receiverType = _resolveTypeParameter(receiverType, ifLegacy: true);
if (name == 'new') {
_needsGetterError = true;
_needsSetterError = true;
@ -91,8 +87,7 @@ class TypePropertyResolver {
return _toResult();
}
if (_isNonNullableByDefault &&
_typeSystem.isPotentiallyNullable(receiverType) &&
if (_typeSystem.isPotentiallyNullable(receiverType) &&
!receiverType.isExtensionType) {
_lookupInterfaceType(_typeProvider.objectType);
if (_hasGetterOrSetter) {
@ -166,15 +161,14 @@ class TypePropertyResolver {
_reportedSetterError = true;
// Recovery, get some resolution.
receiverType = _resolveTypeParameter(receiverType, ifNullSafe: true);
receiverType = _typeSystem.resolveToBound(receiverType);
if (receiverType is InterfaceType) {
_lookupInterfaceType(receiverType);
}
return _toResult();
} else {
var receiverTypeResolved =
_resolveTypeParameter(receiverType, ifNullSafe: true);
var receiverTypeResolved = _typeSystem.resolveToBound(receiverType);
if (receiverTypeResolved is InterfaceType) {
_lookupInterfaceType(receiverTypeResolved);
@ -291,26 +285,6 @@ class TypePropertyResolver {
_setterRecovery = null;
}
/// If the given [type] is a type parameter, replace it with its bound.
/// Otherwise, return the original type.
///
/// See https://github.com/dart-lang/language/issues/1182
/// There was a bug in the analyzer (and CFE) - we were always resolving
/// types to bounds before searching for a property. But extensions should
/// be applied to original types. Fixing this would be a breaking change,
/// so we fix it together with null safety.
DartType _resolveTypeParameter(
DartType type, {
bool ifLegacy = false,
bool ifNullSafe = false,
}) {
if (_isNonNullableByDefault ? ifNullSafe : ifLegacy) {
return _typeSystem.resolveToBound(type);
} else {
return type;
}
}
ResolutionResult _toResult() {
_getterRequested = _resolver.toLegacyElement(_getterRequested);
_getterRecovery = _resolver.toLegacyElement(_getterRecovery);