Skip to content

Commit 6338283

Browse files
committed
Elements. Migrate DartCompletionRequestExtensions.
Change-Id: I998b7e445772ea2ca0f4adf80ed07dc06867eefd Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398923 Reviewed-by: Keerti Parthasarathy <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent bb4850b commit 6338283

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

pkg/analysis_server/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ lib/src/services/search/hierarchy.dart
6565
lib/src/services/search/search_engine.dart
6666
lib/src/services/search/search_engine_internal.dart
6767
lib/src/utilities/extensions/ast.dart
68-
lib/src/utilities/extensions/completion_request.dart
6968
lib/src/utilities/extensions/element.dart
7069
test/abstract_single_unit.dart
7170
test/plugin/protocol_dart_test.dart

pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import 'package:analyzer/dart/ast/syntactic_entity.dart';
2323
import 'package:analyzer/dart/ast/token.dart';
2424
import 'package:analyzer/dart/ast/visitor.dart';
2525
import 'package:analyzer/dart/element/element.dart';
26+
import 'package:analyzer/dart/element/element2.dart';
2627
import 'package:analyzer/dart/element/type.dart';
2728
import 'package:analyzer/source/source_range.dart';
2829
import 'package:analyzer/src/dart/ast/ast.dart';
@@ -2248,22 +2249,22 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
22482249
if (type != null) {
22492250
_forMemberAccess(node, type, onlySuper: target is SuperExpression);
22502251
} else {
2251-
var element = target.staticElement;
2252+
var element = target.element;
22522253
if (element != null) {
22532254
var parent = node.parent;
22542255
var mustBeAssignable =
22552256
parent is AssignmentExpression && node == parent.leftHandSide;
2256-
if (element is PrefixElement) {
2257+
if (element is PrefixElement2) {
22572258
declarationHelper(
22582259
mustBeAssignable: mustBeAssignable,
2259-
).addDeclarationsThroughImportPrefix(element);
2260+
).addDeclarationsThroughImportPrefix(element.asElement);
22602261
} else {
22612262
declarationHelper(
22622263
mustBeAssignable: mustBeAssignable,
22632264
preferNonInvocation:
2264-
element is InterfaceElement &&
2265+
element is InterfaceElement2 &&
22652266
state.request.shouldSuggestTearOff(element),
2266-
).addStaticMembersOfElement(element);
2267+
).addStaticMembersOfElement(element.asElement!);
22672268
}
22682269
}
22692270
}

pkg/analysis_server/lib/src/utilities/extensions/completion_request.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
66
import 'package:analyzer/dart/analysis/features.dart';
7-
import 'package:analyzer/dart/element/element.dart';
7+
import 'package:analyzer/dart/element/element2.dart';
88
import 'package:analyzer/dart/element/nullability_suffix.dart';
99
import 'package:analyzer/dart/element/type.dart';
1010

@@ -15,8 +15,8 @@ extension DartCompletionRequestExtensions on DartCompletionRequest {
1515
///
1616
// TODO(scheglov): Validate that suggesting a tear-off instead of invocation
1717
// is statistically a good choice.
18-
bool shouldSuggestTearOff(InterfaceElement element) {
19-
if (!libraryElement.featureSet.isEnabled(Feature.constructor_tearoffs)) {
18+
bool shouldSuggestTearOff(InterfaceElement2 element) {
19+
if (!libraryElement2.featureSet.isEnabled(Feature.constructor_tearoffs)) {
2020
return false;
2121
}
2222

@@ -27,13 +27,13 @@ extension DartCompletionRequestExtensions on DartCompletionRequest {
2727

2828
var bottomInstance = element.instantiate(
2929
typeArguments: List.filled(
30-
element.typeParameters.length,
31-
libraryElement.typeProvider.neverType,
30+
element.typeParameters2.length,
31+
libraryElement2.typeProvider.neverType,
3232
),
3333
nullabilitySuffix: NullabilitySuffix.none,
3434
);
3535

36-
return libraryElement.typeSystem.isSubtypeOf(
36+
return libraryElement2.typeSystem.isSubtypeOf(
3737
bottomInstance,
3838
contextType.returnType,
3939
);

0 commit comments

Comments
 (0)