[analysis_server] Remove useLineEndingsForPlatform=false from some fix tests

See #60234

Change-Id: I851779a43260a468d772dbb997a1f7e1e2395656
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441960
Reviewed-by: Keerti Parthasarathy <[email protected]>
Commit-Queue: Keerti Parthasarathy <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: DanTup

pkg/analysis_server/test/abstract_single_unit.dart

@@ -18,10 +18,11 @@ import 'abstract_context.dart';
 class AbstractSingleUnitTest extends AbstractContextTest {
   bool verifyNoTestUnitErrors = true;
 
-  /// Whether the test code should parse carrets as position shorthands.
+  /// Whether the test code should parse with position and range shorthands.
   ///
-  /// Set this to `true` when the test code is using the carret operator.
-  bool keepCaret = false;
+  /// Set this to `false` when the test code contains a legitimate carret
+  /// or contains `[!` or `!]`.
+  bool allowTestCodeShorthand = true;
 
   TestCode? _parsedTestCode;
   late ParsedUnitResult testParsedResult;
@@ -45,7 +46,8 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   set testCode(String value) {
     parsedTestCode = TestCode.parse(
       normalizeSource(value),
-      positionShorthand: !keepCaret,
+      positionShorthand: allowTestCodeShorthand,
+      rangeShorthand: allowTestCodeShorthand,
     );
   }
 

pkg/analysis_server/test/src/services/correction/fix/add_null_check_test.dart

@@ -531,6 +531,9 @@ String? f(String? s) => s!..hashCode..length;
   }
 
   Future<void> test_spreadList() async {
+    // expected code contains !] which looks like a range.
+    allowTestCodeShorthand = false;
+
     await resolveTestCode('''
 void f (List<String>? args) {
   [...args];

pkg/analysis_server/test/src/services/correction/fix/convert_for_each_to_for_loop_test.dart

@@ -46,8 +46,6 @@ void f(List<String> a, List<String> b) {
   }
 
   Future<void> test_blockBody_expressionBody() async {
-    useLineEndingsForPlatform = false;
-
     await resolveTestCode(r'''
 void f(List<String> a, List<String> b) {
   var result = <String>[];
@@ -69,8 +67,6 @@ void f(List<String> a, List<String> b) {
   }
 
   Future<void> test_expressionBody_blockBody() async {
-    useLineEndingsForPlatform = false;
-
     await resolveTestCode(r'''
 void f(List<String> a, List<String> b) {
   var result = <String>[];
@@ -92,8 +88,6 @@ void f(List<String> a, List<String> b) {
   }
 
   Future<void> test_expressionBody_expressionBody() async {
-    useLineEndingsForPlatform = false;
-
     await resolveTestCode(r'''
 void f(List<String> a, List<String> b) {
   var result = <String>[];

pkg/analysis_server/test/src/services/correction/fix/convert_to_boolean_expression_test.dart

@@ -466,7 +466,8 @@ void f(bool value) {
   }
 
   Future<void> test_xorFalse() async {
-    keepCaret = true;
+    allowTestCodeShorthand = false; // Test uses ^
+
     await resolveTestCode(r'''
 void f(bool value) {
   if (value ^ false) print(value);
@@ -480,7 +481,8 @@ void f(bool value) {
   }
 
   Future<void> test_xorTrue() async {
-    keepCaret = true;
+    allowTestCodeShorthand = false; // Test uses ^
+
     await resolveTestCode(r'''
 void f(bool value) {
   if (value ^ true) print(value);

pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart

@@ -222,8 +222,6 @@ void f() {
   }
 
   Future<void> test_withImport() async {
-    useLineEndingsForPlatform = false;
-
     newFile('$workspaceRootPath/pkg/lib/a/a.dart', '''
 class A {}
 ''');
@@ -261,21 +259,21 @@ import 'package:pkg/c/c.dart';
 
 void f() {
   A? a;
-  B b;
-  new C(a, b);
+  /*0*/B /*1*/b;
+  new C(a, /*2*/b);
 }
 ''');
     var groups = change.linkedEditGroups;
     expect(groups, hasLength(2));
     var typeGroup = groups[0];
     var typePositions = typeGroup.positions;
     expect(typePositions, hasLength(1));
-    expect(typePositions[0].offset, 115);
+    expect(typePositions[0].offset, parsedExpectedCode.positions[0].offset);
     var nameGroup = groups[1];
     var groupPositions = nameGroup.positions;
     expect(groupPositions, hasLength(2));
-    expect(groupPositions[0].offset, 117);
-    expect(groupPositions[1].offset, 131);
+    expect(groupPositions[0].offset, parsedExpectedCode.positions[1].offset);
+    expect(groupPositions[1].offset, parsedExpectedCode.positions[2].offset);
   }
 
   Future<void> test_write_assignment() async {

pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart

@@ -13,6 +13,7 @@ import 'package:analysis_server_plugin/src/correction/fix_processor.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/test_utilities/test_code_format.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart'
     hide AnalysisError;
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -375,20 +376,29 @@ abstract class FixProcessorLintTest extends FixProcessorTest {
 
 /// A base class defining support for writing fix processor tests.
 abstract class FixProcessorTest extends BaseFixProcessorTest {
+  late TestCode parsedExpectedCode;
+
   /// The kind of fixes being tested by this test class.
   FixKind get kind;
 
   /// Asserts that the resolved compilation unit has a fix which produces
-  /// [expected] output.
+  /// [expectedContent] output.
+  ///
+  /// [expectedContent] will have newlines normalized and be parsed with
+  /// [TestCode.parse], with the resulting code stored in [parsedExpectedCode].
   Future<void> assertHasFix(
-    String expected, {
+    String expectedContent, {
     ErrorFilter? errorFilter,
     String? target,
     int? expectedNumberOfFixesForKind,
     String? matchFixMessage,
     bool allowFixAllFixes = false,
   }) async {
-    expected = normalizeSource(expected);
+    parsedExpectedCode = TestCode.parse(
+      normalizeSource(expectedContent),
+      positionShorthand: allowTestCodeShorthand,
+      rangeShorthand: allowTestCodeShorthand,
+    );
     var diagnostic = await _findDiagnosticToFix(filter: errorFilter);
     var fix = await _assertHasFix(
       diagnostic,
@@ -409,7 +419,7 @@ abstract class FixProcessorTest extends BaseFixProcessorTest {
     }
 
     resultCode = SourceEdit.applySequence(fileContent, change.edits[0].edits);
-    expect(resultCode, expected);
+    expect(resultCode, parsedExpectedCode.code);
   }
 
   Future<void> assertHasFixAllFix(

pkg/analysis_server/test/src/services/correction/fix/update_sdk_constraints_test.dart

@@ -54,6 +54,15 @@ class C {
     );
   }
 
+  @override
+  void setUp() {
+    super.setUp();
+
+    // These tests use ^ a lot but the base methods use TestCode.parse() that
+    // considers them position markers by default.
+    allowTestCodeShorthand = false;
+  }
+
   Future<void> test_any() async {
     await assertUpdateWithGtGtGt(from: 'any', to: '^2.14.0');
   }