API. Deprecate 'VariableDeclaration.declaredElement', use 'VariableDeclaration.declaredFragment'.

This makes API consistent.

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

Author: scheglov

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

@@ -787,7 +787,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
         exceptionParameter.name,
         HighlightRegionType.LOCAL_VARIABLE_DECLARATION,
         additionalSemanticTokenModifiers: _additionalModifiersForElement(
-          exceptionParameter.declaredElement,
+          exceptionParameter.declaredFragment?.element,
         ),
       );
     }
@@ -797,7 +797,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
         stackTraceParameter.name,
         HighlightRegionType.LOCAL_VARIABLE_DECLARATION,
         additionalSemanticTokenModifiers: _additionalModifiersForElement(
-          stackTraceParameter.declaredElement,
+          stackTraceParameter.declaredFragment?.element,
         ),
       );
     }
@@ -922,7 +922,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
       node.name,
       HighlightRegionType.LOCAL_VARIABLE_DECLARATION,
       additionalSemanticTokenModifiers: _additionalModifiersForElement(
-        node.declaredElement,
+        node.declaredFragment?.element,
       ),
     );
 
@@ -1831,7 +1831,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
-    var element = node.declaredFragment?.element ?? node.declaredElement;
+    var element = node.declaredFragment?.element;
     if (element is FieldElement) {
       computer._addRegion_token(
         node.name,

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

@@ -335,7 +335,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredFragment?.element;
     if (declaration is LocalVariableElement) {
       _computer.addVariableTypePrefix(node.name, declaration.type);
     }
@@ -350,7 +350,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement;
+    var declaration = node.declaredFragment?.element;
     if (declaration != null) {
       _computer.addVariableTypePrefix(node.name, declaration.type);
     }

pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart

@@ -147,10 +147,11 @@ class DartUnitOccurrencesComputerVisitor extends GeneralizingAstVisitor<void> {
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    if (node.declaredElement case BindPatternVariableElement(:var join?)) {
+    var declaredElement = node.declaredFragment!.element;
+    if (declaredElement case BindPatternVariableElement(:var join?)) {
       _addOccurrence(join.baseElement, node.name);
     } else {
-      _addOccurrence(node.declaredElement!, node.name);
+      _addOccurrence(declaredElement, node.name);
     }
 
     super.visitDeclaredVariablePattern(node);

pkg/analysis_server/lib/src/lsp/handlers/handler_inline_value.dart

@@ -294,7 +294,7 @@ class _InlineValueVisitor extends GeneralizingAstVisitor<void> {
   void visitDeclaredIdentifier(DeclaredIdentifier node) {
     var name = node.name;
     collector.recordVariableLookup(
-      node.declaredElement,
+      node.declaredFragment?.element,
       name.offset,
       name.length,
     );
@@ -305,7 +305,7 @@ class _InlineValueVisitor extends GeneralizingAstVisitor<void> {
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
     var name = node.name;
     collector.recordVariableLookup(
-      node.declaredElement,
+      node.declaredFragment?.element,
       name.offset,
       name.length,
     );
@@ -423,7 +423,7 @@ class _InlineValueVisitor extends GeneralizingAstVisitor<void> {
   void visitVariableDeclaration(VariableDeclaration node) {
     var name = node.name;
     collector.recordVariableLookup(
-      node.declaredElement,
+      node.declaredFragment?.element,
       name.offset,
       name.length,
     );

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

@@ -2500,12 +2500,12 @@ class DeclarationHelper {
   }
 
   void _visitCatchClause(CatchClause node) {
-    var exceptionElement = node.exceptionParameter?.declaredElement;
+    var exceptionElement = node.exceptionParameter?.declaredFragment?.element;
     if (exceptionElement != null) {
       _suggestVariable(exceptionElement);
     }
 
-    var stackTraceElement = node.stackTraceParameter?.declaredElement;
+    var stackTraceElement = node.stackTraceParameter?.declaredFragment?.element;
     if (stackTraceElement != null) {
       _suggestVariable(stackTraceElement);
     }
@@ -2532,15 +2532,15 @@ class DeclarationHelper {
   }
 
   void _visitDeclaredVariablePattern(DeclaredVariablePattern pattern) {
-    var declaredElement = pattern.declaredElement;
+    var declaredElement = pattern.declaredFragment?.element;
     if (declaredElement != null) {
       _suggestVariable(declaredElement);
     }
   }
 
   void _visitForLoopParts(ForLoopParts node) {
     if (node is ForEachPartsWithDeclaration) {
-      var declaredElement = node.loopVariable.declaredElement;
+      var declaredElement = node.loopVariable.declaredFragment?.element;
       if (declaredElement != null) {
         _suggestVariable(declaredElement);
       }
@@ -2549,7 +2549,7 @@ class DeclarationHelper {
     } else if (node is ForPartsWithDeclarations) {
       var variables = node.variables;
       for (var variable in variables.variables) {
-        var declaredElement = variable.declaredElement;
+        var declaredElement = variable.declaredFragment?.element;
         if (declaredElement is LocalVariableElement) {
           _suggestVariable(declaredElement);
         }
@@ -2660,8 +2660,8 @@ class DeclarationHelper {
           var variables = statement.variables;
           for (var variable in variables.variables) {
             if (variable.end < offset) {
-              var declaredElement = variable.declaredElement;
-              if (declaredElement != null) {
+              var declaredElement = variable.declaredFragment?.element;
+              if (declaredElement is LocalVariableElement) {
                 _suggestVariable(declaredElement);
               }
             }
@@ -2741,8 +2741,8 @@ class DeclarationHelper {
     if (child is VariableDeclaration) {
       var index = variables.indexOf(child);
       for (var i = index - 1; i >= 0; i--) {
-        var element = variables[i].declaredElement;
-        if (element != null) {
+        var element = variables[i].declaredFragment?.element;
+        if (element is LocalVariableElement) {
           _suggestVariable(element);
         }
       }

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

@@ -1262,7 +1262,7 @@ parent3: ${node.parent?.parent?.parent}
     if (pattern is AssignedVariablePattern) {
       element = pattern.element;
     } else if (pattern is DeclaredVariablePattern) {
-      element = pattern.declaredElement;
+      element = pattern.declaredFragment?.element;
       // } else if (pattern is RecordPattern) {
       //   pattern.fields.map((e) => _requiredTypeOfPattern(e.pattern)).toList();
     } else if (pattern is ListPattern) {

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

@@ -149,10 +149,8 @@ class AddExplicitCast extends ResolvedCorrectionProducer {
     if (parent is AssignmentExpression && target == parent.rightHandSide) {
       toType = parent.writeType!;
     } else if (parent is VariableDeclaration && target == parent.initializer) {
-      if (parent.declaredElement case var declaredElement?) {
+      if (parent.declaredFragment?.element case var declaredElement?) {
         toType = declaredElement.type;
-      } else if (parent.declaredFragment case var declaredFragment?) {
-        toType = declaredFragment.element.type;
       } else {
         return null;
       }

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

@@ -122,7 +122,7 @@ class AddNullCheck extends ResolvedCorrectionProducer {
       toType = parent.realTarget.typeOrThrow;
     } else if (parent is ForEachPartsWithDeclaration) {
       toType = typeProvider.iterableType(
-        parent.loopVariable.declaredElement!.type,
+        parent.loopVariable.declaredFragment!.element.type,
       );
     } else if (parent is ForEachPartsWithIdentifier) {
       toType = typeProvider.iterableType(parent.identifier.typeOrThrow);

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

@@ -114,7 +114,7 @@ class AddTypeAnnotation extends ResolvedCorrectionProducer {
     if (declaredIdentifier.type != null) {
       return;
     }
-    var type = declaredIdentifier.declaredElement!.type;
+    var type = declaredIdentifier.declaredFragment!.element.type;
     if (type is! InterfaceType &&
         type is! FunctionType &&
         type is! RecordType &&
@@ -225,8 +225,8 @@ class AddTypeAnnotation extends ResolvedCorrectionProducer {
     if (statement is! VariableDeclarationStatement || block is! Block) {
       return null;
     }
-    var element = variable.declaredElement;
-    if (element == null) {
+    var element = variable.declaredFragment?.element;
+    if (element is! LocalVariableElement) {
       return null;
     }
     var statements = block.statements;

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

@@ -105,7 +105,8 @@ class ConvertNullCheckToNullAwareElementOrEntry
               ((node.caseClause?.guardedPattern.pattern as NullCheckPattern)
                           .pattern
                       as DeclaredVariablePattern)
-                  .declaredElement;
+                  .declaredFragment
+                  ?.element;
           if (caseVariable == thenElement.key.canonicalElement) {
             // In case the key is promoted, replace everything before ':' with
             // the expression before 'case', prefixed by '?'.