Use select() instead of NodeLocator in CorrectionProducerContext.

Includes https://dart-review.googlesource.com/c/sdk/+/310060,
as it is 2023-06-20 @ 1243

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

Author: scheglov

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

@@ -9,6 +9,7 @@ import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/transform_override_set.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server/src/utilities/flutter.dart';
+import 'package:analysis_server/src/utilities/selection.dart';
 import 'package:analyzer/dart/analysis/code_style_options.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -164,9 +165,11 @@ class CorrectionProducerContext<T extends ParsedUnitResult> {
     int selectionOffset = -1,
     int selectionLength = 0,
   }) {
-    var selectionEnd = selectionOffset + selectionLength;
-    var locator = NodeLocator(selectionOffset, selectionEnd);
-    var node = locator.searchWithin(resolvedResult.unit);
+    final selection = resolvedResult.unit.select(
+      offset: selectionOffset,
+      length: selectionLength,
+    );
+    var node = selection?.coveringNode;
     node ??= resolvedResult.unit;
 
     final token = _tokenAt(node, selectionOffset) ?? node.beginToken;

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

@@ -30,6 +30,9 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
     if (statement is! SwitchStatement) {
       return;
     }
+    if (statement.rightParenthesis.isSynthetic) {
+      return;
+    }
 
     String? enumName;
     var prefix = '';

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

@@ -41,6 +41,11 @@ class ConvertToIfNull extends ResolvedCorrectionProducer {
         defaultExpression = node.elseExpression;
       }
 
+      if (defaultExpression is SimpleIdentifier &&
+          defaultExpression.isSynthetic) {
+        return;
+      }
+
       var parentheses = defaultExpression.precedence <
           Precedence.forTokenType(TokenType.QUESTION_QUESTION);
 

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

@@ -24,6 +24,9 @@ class MakeReturnTypeNullable extends ResolvedCorrectionProducer {
     if (node is! Expression) {
       return;
     }
+    if (node is SimpleIdentifier && node.isSynthetic) {
+      return;
+    }
 
     final type = node.staticType;
     if (type == null) {

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

@@ -24,14 +24,24 @@ class RemoveEmptyConstructorBody extends ResolvedCorrectionProducer {
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
-    var parent = node.parent;
-    if (node is Block && parent is BlockFunctionBody) {
-      await builder.addDartFileEdit(file, (builder) {
-        builder.addSimpleReplacement(
-          utils.getLinesRange(range.node(parent)),
-          ';',
-        );
-      });
+    final node = this.node;
+    if (node is! Block) {
+      return;
     }
+    if (node.leftBracket.isSynthetic || node.rightBracket.isSynthetic) {
+      return;
+    }
+
+    final blockBody = node.parent;
+    if (blockBody is! BlockFunctionBody) {
+      return;
+    }
+
+    await builder.addDartFileEdit(file, (builder) {
+      builder.addSimpleReplacement(
+        utils.getLinesRange(range.node(blockBody)),
+        ';',
+      );
+    });
   }
 }