Elements. Remove deprecated JoinPatternVariableFragment.isConsistent/variables2

These were deprecated in https://dart-review.googlesource.com/c/sdk/+/440360

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

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -9,6 +9,8 @@
 * Remove deprecated `LocalVariableElement.hasInitializer`.
 * Remove deprecated `LocalVariableFragment.hasInitializer`.
 * Remove deprecated `LocalVariableFragment.nameOffset`.
+* Remove deprecated `JoinPatternVariableFragment.isConsistent`.
+* Remove deprecated `JoinPatternVariableFragment.variables2`.
 * `LibraryFragment` is not `Annotatable` anymore.
 * Stop implementing `ConstantEvaluationTarget` by `ElementAnnotation`.
   This is an internal interface that should not have been exposed.

pkg/analyzer/api.txt

@@ -3769,11 +3769,9 @@ package:analyzer/dart/element/element.dart:
   JoinPatternVariableFragment (class extends Object implements PatternVariableFragment):
     new (constructor: JoinPatternVariableFragment Function())
     element (getter: JoinPatternVariableElement)
-    isConsistent (getter: bool)
     nextFragment (getter: JoinPatternVariableFragment?)
     offset (getter: int)
     previousFragment (getter: JoinPatternVariableFragment?)
-    variables2 (getter: List<PatternVariableFragment>)
   LabelElement (class extends Object implements Element):
     new (constructor: LabelElement Function())
     enclosingElement (getter: ExecutableElement?)

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

@@ -2524,12 +2524,6 @@ abstract class JoinPatternVariableFragment implements PatternVariableFragment {
   @override
   JoinPatternVariableElement get element;
 
-  /// Whether the [variables2] are consistent.
-  ///
-  /// The variables are consistent if they are present in all branches, and have
-  /// the same type and finality.
-  bool get isConsistent;
-
   @override
   JoinPatternVariableFragment? get nextFragment;
 
@@ -2539,9 +2533,6 @@ abstract class JoinPatternVariableFragment implements PatternVariableFragment {
 
   @override
   JoinPatternVariableFragment? get previousFragment;
-
-  /// The variables that join into this variable.
-  List<PatternVariableFragment> get variables2;
 }
 
 /// A label associated with a statement.

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

@@ -5345,7 +5345,10 @@ class JoinPatternVariableElementImpl extends PatternVariableElementImpl
       _wrappedElement.inconsistency = value;
 
   @override
-  bool get isConsistent => _wrappedElement.isConsistent;
+  bool get isConsistent {
+    return _wrappedElement.inconsistency ==
+        shared.JoinedPatternVariableInconsistency.none;
+  }
 
   set isFinal(bool value) => _wrappedElement.isFinal = value;
 
@@ -5410,11 +5413,6 @@ class JoinPatternVariableFragmentImpl extends PatternVariableFragmentImpl
   JoinPatternVariableElementImpl get element =>
       super.element as JoinPatternVariableElementImpl;
 
-  @override
-  bool get isConsistent {
-    return inconsistency == shared.JoinedPatternVariableInconsistency.none;
-  }
-
   @override
   JoinPatternVariableFragmentImpl? get nextFragment =>
       super.nextFragment as JoinPatternVariableFragmentImpl?;
@@ -5442,10 +5440,6 @@ class JoinPatternVariableFragmentImpl extends PatternVariableFragmentImpl
     append(this);
     return result;
   }
-
-  @override
-  List<PatternVariableFragment> get variables2 =>
-      variables.cast<PatternVariableFragment>();
 }
 
 class LabelElementImpl extends ElementImpl implements LabelElement {

pkg/analyzer/test/util/element_printer.dart

@@ -319,7 +319,7 @@ class ElementPrinter {
       return '$enclosingStr::@formalParameter::${fragment.name}';
     } else if (fragment is JoinPatternVariableFragmentImpl) {
       return [
-        if (!fragment.isConsistent) 'notConsistent ',
+        if (!fragment.element.isConsistent) 'notConsistent ',
         if (fragment.isFinal) 'final ',
         fragment.name ?? '',
         '[',