Rename / deprecate more getters and methods.

* Deprecate `DirectiveUriWithLibrary.library2`, use `library` instead.
* Deprecate `ElementAnnotation.element2`, use `element` instead.
* Deprecate `LibraryImport.prefix2`, use `prefix` instead.
* Deprecate `MultiplyDefinedElement.conflictingElements2`, use `conflictingElements` instead.
* Deprecate `ScopeLookupResult.getter2`, use `getter` instead.
* Deprecate `ScopeLookupResult.setter2`, use `setter` instead.

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

Author: fshcheglov

pkg/analysis_server/lib/src/computer/import_elements_computer.dart

@@ -361,7 +361,7 @@ class ImportElementsComputer {
     var scope = libraryResult.libraryElement2.firstFragment.scope;
 
     if (prefix.isNotEmpty) {
-      var prefixElement = scope.lookup(prefix).getter2;
+      var prefixElement = scope.lookup(prefix).getter;
       if (prefixElement is PrefixElement) {
         scope = prefixElement.scope;
       } else {
@@ -370,7 +370,7 @@ class ImportElementsComputer {
     }
 
     var lookupResult = scope.lookup(name);
-    return lookupResult.getter2 != null || lookupResult.setter2 != null;
+    return lookupResult.getter != null || lookupResult.setter != null;
   }
 
   /// Return `true` if the given [import] matches the given specification of

pkg/analysis_server/lib/src/lsp/handlers/custom/handler_imports.dart

@@ -149,7 +149,7 @@ class ImportsHandler
 
       var isMatch =
           element is MultiplyDefinedElement
-              ? element.conflictingElements2.contains(importedElement)
+              ? element.conflictingElements.contains(importedElement)
               : element == importedElement;
 
       if (isMatch) {

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

@@ -211,7 +211,7 @@ class DeclarationHelper {
         prefix: null,
       );
 
-      if (importElement.prefix2 case var importPrefix?) {
+      if (importElement.prefix case var importPrefix?) {
         if (importPrefix.isDeferred) {
           var matcherScore = state.matcher.score('loadLibrary');
           if (matcherScore != -1) {
@@ -318,7 +318,7 @@ class DeclarationHelper {
   void addImportPrefixes() {
     var library = request.libraryElement;
     for (var element in library.firstFragment.libraryImports) {
-      var importPrefix = element.prefix2;
+      var importPrefix = element.prefix;
       if (importPrefix == null) {
         continue;
       }
@@ -946,7 +946,7 @@ class DeclarationHelper {
         _addConstructorsImportedFrom(
           library: importedLibrary,
           namespace: importElement.namespace,
-          prefix: importElement.prefix2?.element.name,
+          prefix: importElement.prefix?.element.name,
         );
       }
     }
@@ -964,7 +964,7 @@ class DeclarationHelper {
         _addDeclarationsImportedFrom(
           library: importedLibrary,
           namespace: importElement.namespace,
-          prefix: importElement.prefix2?.element.name,
+          prefix: importElement.prefix?.element.name,
         );
         if (importedLibrary.isDartCore && mustBeType) {
           var name = 'Never';

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

@@ -37,7 +37,7 @@ class AmbiguousImportFix extends MultiCorrectionProducer {
     if (element is! MultiplyDefinedElement) {
       return const [];
     }
-    var conflictingElements = element.conflictingElements2;
+    var conflictingElements = element.conflictingElements;
     var name = element.name;
     if (name == null || name.isEmpty) {
       return const [];

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

@@ -137,7 +137,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       // Check elements from imports.
       for (var importElement
           in unitResult.libraryElement2.firstFragment.libraryImports) {
-        if (importElement.prefix2?.element.name == prefixName) {
+        if (importElement.prefix?.element.name == prefixName) {
           var namespace = getImportNamespace(importElement);
           finder._updateList(namespace.values);
         }
@@ -244,7 +244,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       // Check unprefixed imports.
       for (var importElement
           in unitResult.libraryElement2.firstFragment.libraryImports) {
-        if (importElement.prefix2?.element.name == prefixName) {
+        if (importElement.prefix?.element.name == prefixName) {
           var namespace = getImportNamespace(importElement);
           finder._updateList(namespace.values);
         }

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

@@ -201,7 +201,7 @@ class _CreateClass extends ResolvedCorrectionProducer {
     } else {
       for (var import in libraryElement2.firstFragment.libraryImports) {
         if (_prefixElement is PrefixElement &&
-            import.prefix2?.element == _prefixElement) {
+            import.prefix?.element == _prefixElement) {
           var library = import.importedLibrary;
           if (library != null) {
             targetUnit = library.firstFragment;

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

@@ -155,7 +155,7 @@ class _CreateMixin extends ResolvedCorrectionProducer {
     } else {
       for (var import in libraryElement2.firstFragment.libraryImports) {
         if (prefixElement is PrefixElement &&
-            import.prefix2?.element == prefixElement) {
+            import.prefix?.element == prefixElement) {
           var library = import.importedLibrary;
           if (library != null) {
             targetUnit = library.firstFragment;

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

@@ -123,7 +123,7 @@ class ImportLibrary extends MultiCorrectionProducer {
             case var exportedName?)
           exportedName,
     ];
-    var importPrefix = import.prefix2?.element;
+    var importPrefix = import.prefix?.element;
     var importCombinator = _ImportLibraryCombinator(
       uri,
       combinators,
@@ -255,7 +255,7 @@ class ImportLibrary extends MultiCorrectionProducer {
       if (!kinds.contains(element.kind)) {
         continue;
       }
-      var importPrefix = import.prefix2?.element;
+      var importPrefix = import.prefix?.element;
       // Maybe update a "show"/"hide" directive.
       var (
         combinatorProducer,

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

@@ -50,7 +50,7 @@ LibraryImport? _getImportElement(
       continue;
     }
     // required prefix
-    var prefixElement = libraryImport.prefix2?.element;
+    var prefixElement = libraryImport.prefix?.element;
     if (prefixElement == null) {
       continue;
     }

pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart

@@ -1888,7 +1888,7 @@ extension on LibraryElement {
       // Ensure import.
       var importElement = _getImportElement(element);
       if (importElement != null) {
-        var prefix = importElement.prefix2?.element;
+        var prefix = importElement.prefix?.element;
         if (prefix != null) {
           sb.write(prefix.displayName);
           sb.write('.');