Skip to content

Commit 05696d5

Browse files
keertipCommit Queue
authored andcommitted
Migrate postfix_completion.dart, statement_completion.dart.
Change-Id: Ib3723395354822f010f207393ddebcc0b93cf289 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397982 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Keerti Parthasarathy <[email protected]>
1 parent ed49d04 commit 05696d5

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

pkg/analysis_server/analyzer_use_new_elements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ lib/src/services/completion/dart/identifier_helper.dart
3333
lib/src/services/completion/dart/in_scope_completion_pass.dart
3434
lib/src/services/completion/dart/not_imported_completion_pass.dart
3535
lib/src/services/completion/dart/visibility_tracker.dart
36-
lib/src/services/completion/postfix/postfix_completion.dart
37-
lib/src/services/completion/statement/statement_completion.dart
3836
lib/src/services/correction/dart/add_extension_override.dart
3937
lib/src/services/correction/dart/create_extension_member.dart
4038
lib/src/services/correction/dart/import_library.dart

pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:analysis_server_plugin/edit/correction_utils.dart';
88
import 'package:analyzer/dart/analysis/results.dart';
99
import 'package:analyzer/dart/analysis/session.dart';
1010
import 'package:analyzer/dart/ast/ast.dart';
11-
import 'package:analyzer/dart/element/element.dart';
11+
import 'package:analyzer/dart/element/element2.dart';
1212
import 'package:analyzer/dart/element/nullability_suffix.dart';
1313
import 'package:analyzer/dart/element/type.dart';
1414
import 'package:analyzer/dart/element/type_provider.dart';
@@ -620,7 +620,7 @@ final class PostfixCompletionProcessor {
620620
}
621621

622622
Expression? _findOuterExpression(AstNode? start, InterfaceType builtInType) {
623-
if (start is SimpleIdentifier && start.staticElement is PrefixElement) {
623+
if (start is SimpleIdentifier && start.element is PrefixElement2) {
624624
return null;
625625
}
626626

pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:analysis_server_plugin/edit/correction_utils.dart';
1010
import 'package:analyzer/dart/analysis/results.dart';
1111
import 'package:analyzer/dart/ast/ast.dart';
1212
import 'package:analyzer/dart/ast/token.dart';
13-
import 'package:analyzer/dart/element/element.dart';
13+
import 'package:analyzer/dart/element/element2.dart';
1414
import 'package:analyzer/error/error.dart' as engine;
1515
import 'package:analyzer/error/error.dart';
1616
import 'package:analyzer/source/line_info.dart';
@@ -158,11 +158,11 @@ class StatementCompletionProcessor {
158158

159159
int get selectionOffset => statementContext.selectionOffset;
160160

161-
Source get source => unitElement.source;
161+
Source get source => unitFragment.source;
162162

163163
CompilationUnit get unit => statementContext.resolveResult.unit;
164164

165-
CompilationUnitElement get unitElement => unit.declaredElement!;
165+
LibraryFragment get unitFragment => unit.declaredFragment!;
166166

167167
Future<StatementCompletion> compute() async {
168168
var node = _selectedNode();
@@ -232,7 +232,7 @@ class StatementCompletionProcessor {
232232

233233
void _addInsertEdit(int offset, String text) {
234234
var edit = SourceEdit(offset, 0, text);
235-
doSourceChange_addElementEdit(change, unitElement, edit);
235+
doSourceChange_addFragmentEdit(change, unitFragment, edit);
236236
}
237237

238238
void _addReplaceEdit(SourceRange range, String text) {
@@ -243,7 +243,7 @@ class StatementCompletionProcessor {
243243
// the edits are applied. The implementation needs to be cleaned up in
244244
// order to prevent the conflicting edit from being generated.
245245
// doSourceChange_addElementEdit(change, unitElement, edit);
246-
var fileEdit = change.getFileEdit(unitElement.source.fullName);
246+
var fileEdit = change.getFileEdit(unitFragment.source.fullName);
247247
if (fileEdit == null) {
248248
fileEdit = SourceFileEdit(file, 0);
249249
change.addFileEdit(fileEdit);

0 commit comments

Comments
 (0)