[element model] migrate body_inference_context

Change-Id: Ib5021c597c174903584a367e730af2a127915423 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/402143 Reviewed-by: Brian Wilkerson <[email protected]>
dart-lang · Dec 20, 2024 · b79f187 · b79f187
1 parent 8a08c1b
commit b79f187
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pkg/analyzer/analyzer_use_new_elements.txt b/pkg/analyzer/analyzer_use_new_elements.txt
@@ -61,7 +61,6 @@ lib/src/dart/resolver/applicable_extensions.dart
 lib/src/dart/resolver/assignment_expression_resolver.dart
 lib/src/dart/resolver/ast_rewrite.dart
 lib/src/dart/resolver/binary_expression_resolver.dart
-lib/src/dart/resolver/body_inference_context.dart
 lib/src/dart/resolver/comment_reference_resolver.dart
 lib/src/dart/resolver/constructor_reference_resolver.dart
 lib/src/dart/resolver/extension_member_resolver.dart

diff --git a/pkg/analyzer/lib/src/dart/resolver/body_inference_context.dart b/pkg/analyzer/lib/src/dart/resolver/body_inference_context.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
@@ -79,8 +79,8 @@ class BodyInferenceContext {
 
     if (isGenerator) {
       var requiredClass = isAsynchronous
-          ? _typeProvider.streamElement
-          : _typeProvider.iterableElement;
+          ? _typeProvider.streamElement2
+          : _typeProvider.iterableElement2;
       var type = _argumentOf(expressionType, requiredClass);
       if (type != null) {
         _returnTypes.add(type);
@@ -157,8 +157,8 @@ class BodyInferenceContext {
     return _returnTypes.fold(initialType, _typeSystem.leastUpperBound);
   }
 
-  static DartType? _argumentOf(DartType type, InterfaceElement element) {
-    var elementType = type.asInstanceOf(element);
+  static DartType? _argumentOf(DartType type, InterfaceElement2 element) {
+    var elementType = type.asInstanceOf2(element);
     if (elementType != null) {
       return elementType.typeArguments[0];
     }
@@ -186,7 +186,7 @@ class BodyInferenceContext {
     if (node.isGenerator && node.isAsynchronous) {
       var elementType = _argumentOf(
         imposedType,
-        typeSystem.typeProvider.streamElement,
+        typeSystem.typeProvider.streamElement2,
       );
       if (elementType != null) {
         return elementType;
@@ -199,7 +199,7 @@ class BodyInferenceContext {
     if (node.isGenerator && node.isSynchronous) {
       var elementType = _argumentOf(
         imposedType,
-        typeSystem.typeProvider.iterableElement,
+        typeSystem.typeProvider.iterableElement2,
       );
       if (elementType != null) {
         return elementType;