DAS: Rename CorrectionProducer.errorLength and errorOffset to diagnostic names

Change-Id: I7578da7f1be1f996474b22621885e45ab3e86428
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/434100
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: srawlins

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

@@ -118,7 +118,7 @@ class AddAwait extends ResolvedCorrectionProducer {
         );
       }
       builder.addSimpleInsertion(
-        offset ?? errorOffset ?? node.offset,
+        offset ?? diagnosticOffset ?? node.offset,
         'await ',
       );
     });

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

@@ -216,7 +216,7 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
 
     // Create fixes only when its the first diagnostic.
     if (propertyDiagnostics.isNotEmpty &&
-        errorOffset != propertyDiagnostics.first.offset) {
+        diagnosticOffset != propertyDiagnostics.first.offset) {
       return;
     }
 

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

@@ -44,8 +44,8 @@ class ConvertToIfNull extends ResolvedCorrectionProducer {
   Future<void> _preferIfNull(ChangeBuilder builder) async {
     var node = this.node;
     if (node is ConditionalExpression &&
-        node.offset == errorOffset &&
-        node.length == errorLength) {
+        node.offset == diagnosticOffset &&
+        node.length == diagnosticLength) {
       var condition = node.condition as BinaryExpression;
       Expression nullableExpression;
       Expression defaultExpression;
@@ -87,8 +87,8 @@ class ConvertToIfNull extends ResolvedCorrectionProducer {
   Future<void> _useToConvertNullsToBools(ChangeBuilder builder) async {
     var node = this.node;
     if (node is BinaryExpression &&
-        node.offset == errorOffset &&
-        node.length == errorLength &&
+        node.offset == diagnosticOffset &&
+        node.length == diagnosticLength &&
         (node.operator.type == TokenType.EQ_EQ ||
             node.operator.type == TokenType.BANG_EQ)) {
       var left = node.leftOperand;

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

@@ -48,16 +48,13 @@ class RemoveConstructor extends ResolvedCorrectionProducer {
   }
 
   ConstructorDeclaration? _findConstructor() {
-    var errorOffset = this.errorOffset;
-    if (errorOffset == null) {
-      return null;
-    }
-
-    var invalidNodes = (unit as CompilationUnitImpl).invalidNodes;
-    for (var constructor in invalidNodes) {
-      if (constructor is ConstructorDeclarationImpl) {
-        if (range.node(constructor).contains(errorOffset)) {
-          return constructor;
+    if (diagnosticOffset case var diagnosticOffset?) {
+      var invalidNodes = (unit as CompilationUnitImpl).invalidNodes;
+      for (var constructor in invalidNodes) {
+        if (constructor is ConstructorDeclarationImpl) {
+          if (range.node(constructor).contains(diagnosticOffset)) {
+            return constructor;
+          }
         }
       }
     }

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

@@ -54,7 +54,7 @@ class RemoveDeadCode extends ResolvedCorrectionProducer {
       );
       return;
     }
-    if (node.offset == errorOffset) {
+    if (node.offset == diagnosticOffset) {
       // The dead code warning starts at the beginning of `node`. Use this node
       // as the starting point for dead code removal, or, if there is a larger
       // AST node that is fully contained in the dead code range, use it as the
@@ -98,7 +98,7 @@ class RemoveDeadCode extends ResolvedCorrectionProducer {
   Future<void> _handleDeadAtEndOfNode(AstNode node) async {
     switch (node) {
       case BinaryExpression(:var leftOperand, :var operator)
-          when operator.offset == errorOffset &&
+          when operator.offset == diagnosticOffset &&
               const [
                 TokenType.AMPERSAND_AMPERSAND,
                 TokenType.BAR_BAR,
@@ -109,12 +109,13 @@ class RemoveDeadCode extends ResolvedCorrectionProducer {
         await _addEdit((builder) {
           builder.addDeletion(range.endEnd(leftOperand, node));
         });
-      case Block(:var rightBracket) when rightBracket.offset == errorOffset:
+      case Block(:var rightBracket)
+          when rightBracket.offset == diagnosticOffset:
         // Dead code starts at the `}` of a block. It's not possible to remove
         // the `}`, but if any dead code follows the block, it may be removed.
         await _removeDeadCodeAfter(partiallyDeadNode: node);
       case DoStatement(:var body, :var whileKeyword)
-          when whileKeyword.offset == errorOffset:
+          when whileKeyword.offset == diagnosticOffset:
         // Dead code starts at the `while` keyword of a `do` loop. This means
         // the body of the loop is partially dead, so the situation is handled
         // by `_removeDeadCodeAfter`.

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

@@ -27,7 +27,9 @@ class UseEffectiveIntegerDivision extends ResolvedCorrectionProducer {
   Future<void> compute(ChangeBuilder builder) async {
     for (var n in node.withAncestors) {
       if (n is! MethodInvocation) continue;
-      if (n.offset != errorOffset && n.length != errorLength) continue;
+      if (n.offset != diagnosticOffset && n.length != diagnosticLength) {
+        continue;
+      }
 
       var target = n.target;
       if (target != null) {

pkg/analysis_server_plugin/api.txt

@@ -56,8 +56,10 @@ package:analysis_server_plugin/edit/dart/correction_producer.dart:
     canBeAppliedAcrossSingleFile (getter: bool)
     canBeAppliedAutomatically (getter: bool)
     coveringNode (getter: AstNode?)
-    errorLength (getter: int?)
-    errorOffset (getter: int?)
+    diagnosticLength (getter: int?)
+    diagnosticOffset (getter: int?)
+    errorLength (getter: int?, deprecated)
+    errorOffset (getter: int?, deprecated)
     fixArguments (getter: List<String>?)
     fixKind (getter: FixKind?)
     multiFixArguments (getter: List<String>?)

pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart

@@ -174,13 +174,17 @@ sealed class CorrectionProducer<T extends ParsedUnitResult>
 
   /// The length of the source range associated with the diagnostic being
   /// fixed, or `null` if there is no diagnostic.
-  // TODO(srawlins): Rename to 'diagnosticLength'.
-  int? get errorLength => diagnostic?.problemMessage.length;
+  int? get diagnosticLength => diagnostic?.problemMessage.length;
 
   /// The offset of the source range associated with the diagnostic being
   /// fixed, or `null` if there is no diagnostic.
-  // TODO(srawlins): Rename to 'diagnosticOffset'.
-  int? get errorOffset => diagnostic?.problemMessage.offset;
+  int? get diagnosticOffset => diagnostic?.problemMessage.offset;
+
+  @Deprecated("Use 'diagnosticLength' instead")
+  int? get errorLength => diagnosticLength;
+
+  @Deprecated("Use 'diagnosticOffset' instead")
+  int? get errorOffset => diagnosticOffset;
 
   /// The arguments that should be used when composing the message for a fix, or
   /// `null` if the fix message has no parameters or if this producer doesn't