Skip to content

Commit b79f187

Browse files
committed
[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]>
1 parent 8a08c1b commit b79f187

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ lib/src/dart/resolver/applicable_extensions.dart
6161
lib/src/dart/resolver/assignment_expression_resolver.dart
6262
lib/src/dart/resolver/ast_rewrite.dart
6363
lib/src/dart/resolver/binary_expression_resolver.dart
64-
lib/src/dart/resolver/body_inference_context.dart
6564
lib/src/dart/resolver/comment_reference_resolver.dart
6665
lib/src/dart/resolver/constructor_reference_resolver.dart
6766
lib/src/dart/resolver/extension_member_resolver.dart

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:analyzer/dart/element/element.dart';
5+
import 'package:analyzer/dart/element/element2.dart';
66
import 'package:analyzer/dart/element/type.dart';
77
import 'package:analyzer/dart/element/type_provider.dart';
88
import 'package:analyzer/src/dart/ast/ast.dart';
@@ -79,8 +79,8 @@ class BodyInferenceContext {
7979

8080
if (isGenerator) {
8181
var requiredClass = isAsynchronous
82-
? _typeProvider.streamElement
83-
: _typeProvider.iterableElement;
82+
? _typeProvider.streamElement2
83+
: _typeProvider.iterableElement2;
8484
var type = _argumentOf(expressionType, requiredClass);
8585
if (type != null) {
8686
_returnTypes.add(type);
@@ -157,8 +157,8 @@ class BodyInferenceContext {
157157
return _returnTypes.fold(initialType, _typeSystem.leastUpperBound);
158158
}
159159

160-
static DartType? _argumentOf(DartType type, InterfaceElement element) {
161-
var elementType = type.asInstanceOf(element);
160+
static DartType? _argumentOf(DartType type, InterfaceElement2 element) {
161+
var elementType = type.asInstanceOf2(element);
162162
if (elementType != null) {
163163
return elementType.typeArguments[0];
164164
}
@@ -186,7 +186,7 @@ class BodyInferenceContext {
186186
if (node.isGenerator && node.isAsynchronous) {
187187
var elementType = _argumentOf(
188188
imposedType,
189-
typeSystem.typeProvider.streamElement,
189+
typeSystem.typeProvider.streamElement2,
190190
);
191191
if (elementType != null) {
192192
return elementType;
@@ -199,7 +199,7 @@ class BodyInferenceContext {
199199
if (node.isGenerator && node.isSynchronous) {
200200
var elementType = _argumentOf(
201201
imposedType,
202-
typeSystem.typeProvider.iterableElement,
202+
typeSystem.typeProvider.iterableElement2,
203203
);
204204
if (elementType != null) {
205205
return elementType;

0 commit comments

Comments
 (0)