Move ClassElement.thisType to API.

[email protected], [email protected]

Change-Id: Ib1b85e01159e93adbab8b3e186f30e939d462739
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/117766
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/dart/element/element.dart

@@ -175,6 +175,15 @@ abstract class ClassElement
   /// guard against infinite loops.
   InterfaceType get supertype;
 
+  /// Return the type of `this` expression for this class.
+  ///
+  /// For a class like `class MyClass<T, U> {}` the returned type is equivalent
+  /// to the type `MyClass<T, U>`. So, the type arguments are the types of the
+  /// type parameters, and either `none` or `star` nullability suffix is used
+  /// for the type arguments, and the returned type depending on the
+  /// nullability status of the declaring library.
+  InterfaceType get thisType;
+
   @override
   InterfaceType get type;
 

pkg/analyzer/lib/src/dart/element/element.dart

@@ -121,13 +121,7 @@ abstract class AbstractClassElementImpl extends ElementImpl
   @override
   List<InterfaceType> get superclassConstraints => const <InterfaceType>[];
 
-  /// Return the type of `this` expression for this class.
-  ///
-  /// For a class like `class MyClass<T, U> {}` the returned type is equivalent
-  /// to the type `MyClass<T, U>`. So, the type arguments are the types of the
-  /// type parameters, and either `none` or `star` nullability suffix is used
-  /// for the type arguments, and the returned type depending on the
-  /// nullability status of the declaring library.
+  @override
   InterfaceType get thisType {
     if (_thisType == null) {
       var nullabilitySuffix = library.isNonNullableByDefault

pkg/analyzer/lib/src/dart/element/handle.dart

@@ -117,6 +117,9 @@ class ClassElementHandle extends ElementHandle implements ClassElement {
   @override
   InterfaceType get supertype => actualElement.supertype;
 
+  @override
+  InterfaceType get thisType => actualElement.thisType;
+
   @override
   InterfaceType get type => actualElement.type;
 

pkg/analyzer/lib/src/generated/resolver.dart

@@ -6303,7 +6303,6 @@ class TypeNameResolver {
   /// otherwise.
   List<DartType> _inferTypeArgumentsForRedirectedConstructor(
       TypeName node, ClassElement typeElement) {
-    var typeElementImpl = AbstractClassElementImpl.getImpl(typeElement);
     AstNode constructorName = node.parent;
     AstNode enclosingConstructor = constructorName?.parent;
     TypeSystem ts = typeSystem;
@@ -6312,15 +6311,14 @@ class TypeNameResolver {
         enclosingConstructor.redirectedConstructor == constructorName &&
         ts is Dart2TypeSystem) {
       ClassOrMixinDeclaration enclosingClassNode = enclosingConstructor.parent;
-      ClassElementImpl enclosingClassElement =
-          enclosingClassNode.declaredElement;
-      if (enclosingClassElement == typeElementImpl) {
-        return typeElementImpl.thisType.typeArguments;
+      var enclosingClassElement = enclosingClassNode.declaredElement;
+      if (enclosingClassElement == typeElement) {
+        return typeElement.thisType.typeArguments;
       } else {
         return ts.inferGenericFunctionOrType(
-          typeParameters: typeElementImpl.typeParameters,
+          typeParameters: typeElement.typeParameters,
           parameters: const [],
-          declaredReturnType: typeElementImpl.thisType,
+          declaredReturnType: typeElement.thisType,
           argumentTypes: const [],
           contextReturnType: enclosingClassElement.thisType,
         );

pkg/analyzer/lib/src/generated/static_type_analyzer.dart

@@ -169,7 +169,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   DartType inferListType(ListLiteral node, {bool downwards: false}) {
     DartType contextType = InferenceContext.getContext(node);
 
-    ClassElementImpl element = _typeProvider.listElement;
+    var element = _typeProvider.listElement;
     var typeParameters = element.typeParameters;
     var genericElementType = typeParameters[0].instantiate(
       nullabilitySuffix: _noneOrStarSuffix,
@@ -226,7 +226,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
       return null;
     }
 
-    ClassElementImpl element = _typeProvider.mapElement;
+    var element = _typeProvider.mapElement;
     var typeArguments =
         (_typeSystem as Dart2TypeSystem).inferGenericFunctionOrType(
       typeParameters: element.typeParameters,
@@ -250,7 +250,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
       return null;
     }
 
-    ClassElementImpl element = _typeProvider.setElement;
+    var element = _typeProvider.setElement;
     var typeArguments =
         (_typeSystem as Dart2TypeSystem).inferGenericFunctionOrType(
       typeParameters: element.typeParameters,
@@ -2114,7 +2114,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
       List<_InferredCollectionElementTypeInformation> inferredTypes) {
     DartType dynamicType = _typeProvider.dynamicType;
 
-    ClassElementImpl element = _typeProvider.mapElement;
+    var element = _typeProvider.mapElement;
     var typeParameters = element.typeParameters;
     var genericKeyType = typeParameters[0].instantiate(
       nullabilitySuffix: _noneOrStarSuffix,
@@ -2152,7 +2152,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
       List<_InferredCollectionElementTypeInformation> inferredTypes) {
     DartType dynamicType = _typeProvider.dynamicType;
 
-    ClassElementImpl element = _typeProvider.setElement;
+    var element = _typeProvider.setElement;
     var typeParameters = element.typeParameters;
     var genericElementType = typeParameters[0].instantiate(
       nullabilitySuffix: _noneOrStarSuffix,