Elements. Migrate test/src/dart/analysis/result_printer.dart

Change-Id: If2faad6d907d806506aaceecca6fdf748c7a1ac7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415242
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -1219,8 +1219,8 @@ final B1 = A1;
     driver.addFile2(a);
     driver.addFile2(b);
 
-    configuration.libraryConfiguration.unitConfiguration
-        .variableTypesSelector2 = (result) {
+    configuration.libraryConfiguration.unitConfiguration.variableTypesSelector =
+        (result) {
       return switch (result.uriStr) {
         'package:test/a.dart' => [
             result.findElement2.topVar('A1'),
@@ -1306,8 +1306,8 @@ final A2 = B1;
     driver.addFile2(a);
     driver.priorityFiles2 = [a];
 
-    configuration.libraryConfiguration.unitConfiguration
-        .variableTypesSelector2 = (result) {
+    configuration.libraryConfiguration.unitConfiguration.variableTypesSelector =
+        (result) {
       switch (result.uriStr) {
         case 'package:test/a.dart':
           return [
@@ -2606,8 +2606,8 @@ final foo = 0;
     var driver = driverFor(testFile);
     var collector = DriverEventCollector(driver);
 
-    configuration.libraryConfiguration.unitConfiguration
-        .variableTypesSelector2 = (result) {
+    configuration.libraryConfiguration.unitConfiguration.variableTypesSelector =
+        (result) {
       return [
         result.findElement2.topVar('foo'),
       ];
@@ -3025,8 +3025,8 @@ final B = A;
     var driver = driverFor(testFile);
     var collector = DriverEventCollector(driver);
 
-    configuration.libraryConfiguration.unitConfiguration
-        .variableTypesSelector2 = (result) {
+    configuration.libraryConfiguration.unitConfiguration.variableTypesSelector =
+        (result) {
       switch (result.uriStr) {
         case 'package:test/b.dart':
           return [
@@ -4535,8 +4535,8 @@ final B = 0;
     driver.addFile2(a);
     driver.addFile2(b);
 
-    configuration.libraryConfiguration.unitConfiguration
-        .variableTypesSelector2 = (result) {
+    configuration.libraryConfiguration.unitConfiguration.variableTypesSelector =
+        (result) {
       switch (result.uriStr) {
         case 'package:test/a.dart':
           return [

pkg/analyzer/test/src/dart/analysis/result_printer.dart

@@ -2,11 +2,8 @@
 // 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.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ -993,17 +990,6 @@ class ResolvedUnitResultPrinter {
       sink.writeElements(
         'selectedVariableTypes',
         variableTypesToWrite,
-        (variable) {
-          sink.writeIndent();
-          sink.write('${variable.name}: ');
-          elementPrinter.writeType(variable.type);
-        },
-      );
-
-      var variableTypesToWrite2 = configuration.variableTypesSelector2(result);
-      sink.writeElements(
-        'selectedVariableTypes',
-        variableTypesToWrite2,
         (variable) {
           sink.writeIndent();
           sink.write('${variable.name3}: ');
@@ -1022,10 +1008,7 @@ class ResolvedUnitResultPrinterConfiguration {
   var nodeConfiguration = ResolvedNodeTextConfiguration();
   AstNode? Function(ResolvedUnitResult) nodeSelector = (_) => null;
   Map<String, DartType> Function(ResolvedUnitResult) typesSelector = (_) => {};
-  List<VariableElement> Function(ResolvedUnitResult) variableTypesSelector =
-      (_) => [];
-  List<Element2> Function(ResolvedUnitResult) variableTypesSelector2 =
-      (_) => [];
+  List<Element2> Function(ResolvedUnitResult) variableTypesSelector = (_) => [];
   bool Function(FileResult) withContentPredicate = (_) => false;
 }