Elements. Deprecate JoinPatternVariableElement.variables2, use 'variables' instead.

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

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -31,6 +31,7 @@
 * Deprecate `InstanceFragment.methods2`, use `methods` instead.
 * Deprecate `InterfaceElement.constructors2`, use `constructors` instead.
 * Deprecate `InterfaceFragment.constructors2`, use `constructors` instead.
+* Deprecate `JoinPatternVariableElement.variables2`, use `variables` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -3440,7 +3440,8 @@ package:analyzer/dart/element/element.dart:
     firstFragment (getter: JoinPatternVariableFragment)
     fragments (getter: List<JoinPatternVariableFragment>)
     isConsistent (getter: bool)
-    variables2 (getter: List<PatternVariableElement>)
+    variables (getter: List<PatternVariableElement>)
+    variables2 (getter: List<PatternVariableElement>, deprecated)
   JoinPatternVariableFragment (class extends Object implements PatternVariableFragment):
     new (constructor: JoinPatternVariableFragment Function())
     element (getter: JoinPatternVariableElement)

pkg/analyzer/lib/dart/element/element.dart

@@ -2250,13 +2250,17 @@ abstract class JoinPatternVariableElement implements PatternVariableElement {
   @override
   List<JoinPatternVariableFragment> get fragments;
 
-  /// Whether the [variables2] are consistent.
+  /// Whether the [variables] are consistent.
   ///
   /// The variables are consistent if they are present in all branches, and have
   /// the same type and finality.
   bool get isConsistent;
 
   /// The variables that join into this variable.
+  List<PatternVariableElement> get variables;
+
+  /// The variables that join into this variable.
+  @Deprecated('Use variables instead')
   List<PatternVariableElement> get variables2;
 }
 

pkg/analyzer/lib/src/dart/element/element.dart

@@ -5487,7 +5487,7 @@ class JoinPatternVariableElementImpl2 extends PatternVariableElementImpl2
     void append(PatternVariableElementImpl2 variable) {
       result.add(variable);
       if (variable is JoinPatternVariableElementImpl2) {
-        for (var variable in variable.variables2) {
+        for (var variable in variable.variables) {
           append(variable);
         }
       }
@@ -5497,13 +5497,17 @@ class JoinPatternVariableElementImpl2 extends PatternVariableElementImpl2
     return result;
   }
 
-  /// The variables that join into this variable.
-  List<PatternVariableFragmentImpl> get variables => _wrappedElement.variables;
-
   @override
-  List<PatternVariableElementImpl2> get variables2 =>
+  List<PatternVariableElementImpl2> get variables =>
       _wrappedElement.variables.map((fragment) => fragment.element).toList();
 
+  /// The variables that join into this variable.
+  @Deprecated('Use variables instead')
+  @override
+  List<PatternVariableElementImpl2> get variables2 {
+    return variables;
+  }
+
   @override
   JoinPatternVariableFragmentImpl get _wrappedElement =>
       super._wrappedElement as JoinPatternVariableFragmentImpl;

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

@@ -1975,7 +1975,7 @@ class _VariableBinder
       expandedVariables = components
           .expand((variable) {
             if (variable is JoinPatternVariableElementImpl2) {
-              return variable.variables2;
+              return variable.variables;
             } else {
               return [variable];
             }

pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart

@@ -376,7 +376,7 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
     if (node.declaredElement2 case BindPatternVariableElement(:var join2?)) {
-      for (var variable in join2.variables2) {
+      for (var variable in join2.variables) {
         computer._addRegionForElement(node.name, variable);
       }
     } else {
@@ -586,8 +586,8 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
           fragment,
         );
       }
-    } else if (element case JoinPatternVariableElement(:var variables2)) {
-      for (var variable in variables2) {
+    } else if (element case JoinPatternVariableElement(:var variables)) {
+      for (var variable in variables) {
         computer._addRegionForElement(node, variable);
       }
     } else {