Skip to content

Commit ddd4f08

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate FlutterWrap and subclasses.
Change-Id: I0289719c1de376405a4c2fcb037484e39332ef15 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389406 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Phil Quitslund <[email protected]>
1 parent 020427a commit ddd4f08

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pkg/analysis_server/analyzer_use_new_elements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ lib/src/services/correction/dart/flutter_move_up.dart
326326
lib/src/services/correction/dart/flutter_remove_widget.dart
327327
lib/src/services/correction/dart/flutter_swap_with_child.dart
328328
lib/src/services/correction/dart/flutter_swap_with_parent.dart
329+
lib/src/services/correction/dart/flutter_wrap.dart
329330
lib/src/services/correction/dart/flutter_wrap_builder.dart
330331
lib/src/services/correction/dart/flutter_wrap_generic.dart
331332
lib/src/services/correction/dart/flutter_wrap_stream_builder.dart

pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:analysis_server/src/services/correction/selection_analyzer.dart'
77
import 'package:analysis_server/src/utilities/extensions/flutter.dart';
88
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
99
import 'package:analyzer/dart/ast/ast.dart';
10-
import 'package:analyzer/dart/element/element.dart';
10+
import 'package:analyzer/dart/element/element2.dart';
1111
import 'package:analyzer/source/source_range.dart';
1212
import 'package:analyzer/src/dart/ast/extensions.dart';
1313
import 'package:analyzer_plugin/utilities/assist/assist.dart';
@@ -228,15 +228,15 @@ abstract class _WrapMultipleWidgets extends ResolvedCorrectionProducer {
228228
var selectedRange = range.startEnd(firstWidget, lastWidget);
229229
var src = utils.getRangeText(selectedRange);
230230
var parentClassElement =
231-
await sessionHelper.getClass(_parentLibraryUri, _parentClassName);
232-
var widgetClassElement = await sessionHelper.getFlutterClass('Widget');
231+
await sessionHelper.getClass2(_parentLibraryUri, _parentClassName);
232+
var widgetClassElement = await sessionHelper.getFlutterClass2('Widget');
233233
if (parentClassElement == null || widgetClassElement == null) {
234234
return;
235235
}
236236

237237
await builder.addDartFileEdit(file, (builder) {
238238
builder.addReplacement(selectedRange, (builder) {
239-
builder.writeReference(parentClassElement);
239+
builder.writeReference2(parentClassElement);
240240
builder.write('(');
241241

242242
var indentOld = utils.getLinePrefix(firstWidget.offset);
@@ -295,10 +295,10 @@ abstract class _WrapSingleWidget extends ResolvedCorrectionProducer {
295295
// If the wrapper class is specified, find its element.
296296
var parentLibraryUri = _parentLibraryUri;
297297
var parentClassName = _parentClassName;
298-
ClassElement? parentClassElement;
298+
ClassElement2? parentClassElement;
299299
if (parentLibraryUri != null && parentClassName != null) {
300300
parentClassElement =
301-
await sessionHelper.getClass(parentLibraryUri, parentClassName);
301+
await sessionHelper.getClass2(parentLibraryUri, parentClassName);
302302
if (parentClassElement == null) {
303303
return;
304304
}
@@ -309,7 +309,7 @@ abstract class _WrapSingleWidget extends ResolvedCorrectionProducer {
309309
if (parentClassElement == null) {
310310
builder.addSimpleLinkedEdit('WIDGET', 'widget');
311311
} else {
312-
builder.writeReference(parentClassElement);
312+
builder.writeReference2(parentClassElement);
313313
}
314314
builder.write('(');
315315
// When there's no linked edit for the widget name, leave the selection

0 commit comments

Comments
 (0)