[analysis_server] Update some tests to not required useLineEndingsForPlatform=false

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

Author: DanTup

pkg/analysis_server/test/plugin/protocol_dart_test.dart

@@ -5,11 +5,13 @@
 import 'package:analysis_server/plugin/protocol/protocol_dart.dart';
 import 'package:analyzer/dart/element/element.dart' as engine;
 import 'package:analyzer/src/dart/element/element.dart' as engine;
+import 'package:analyzer/src/test_utilities/test_code_format.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../abstract_single_unit.dart';
+import '../utils/test_code_extensions.dart';
 
 void main() {
   defineReflectiveSuite(() {
@@ -20,16 +22,10 @@ void main() {
 
 @reflectiveTest
 class ConvertElementTest extends AbstractSingleUnitTest {
-  @override
-  void setUp() {
-    useLineEndingsForPlatform = false;
-    super.setUp();
-  }
-
   Future<void> test_CLASS() async {
     await resolveTestCode('''
 @deprecated
-abstract class _A {}
+abstract class [!_A!] {}
 class B<K, V> {}''');
     {
       var engineElement = findElement2.class_('_A');
@@ -41,10 +37,8 @@ class B<K, V> {}''');
       {
         var location = element.location!;
         expect(location.file, testFile.path);
-        expect(location.offset, 27);
         expect(location.length, '_A'.length);
-        expect(location.startLine, 2);
-        expect(location.startColumn, 16);
+        _expectLocation(location, parsedTestCode.range);
       }
       expect(element.parameters, isNull);
       expect(
@@ -66,7 +60,7 @@ class B<K, V> {}''');
   Future<void> test_CONSTRUCTOR() async {
     await resolveTestCode('''
 class A {
-  const A.myConstructor(int a, [String? b]);
+  const A.[!myConstructor!](int a, [String? b]);
 }''');
     var engineElement = findElement2.constructor('myConstructor');
     // create notification Element
@@ -77,10 +71,8 @@ class A {
     {
       var location = element.location!;
       expect(location.file, testFile.path);
-      expect(location.offset, 20);
       expect(location.length, 'myConstructor'.length);
-      expect(location.startLine, 2);
-      expect(location.startColumn, 11);
+      _expectLocation(location, parsedTestCode.range);
     }
     expect(element.parameters, '(int a, [String? b])');
     expect(element.returnType, 'A');
@@ -153,7 +145,7 @@ class A {
   Future<void> test_ENUM() async {
     await resolveTestCode('''
 @deprecated
-enum _E1 { one, two }
+enum [!_E1!] { one, two }
 enum E2 { three, four }''');
     {
       var engineElement = findElement2.enum_('_E1');
@@ -166,10 +158,8 @@ enum E2 { three, four }''');
       {
         var location = element.location!;
         expect(location.file, testFile.path);
-        expect(location.offset, 17);
         expect(location.length, '_E1'.length);
-        expect(location.startLine, 2);
-        expect(location.startColumn, 6);
+        _expectLocation(location, parsedTestCode.range);
       }
       expect(element.parameters, isNull);
       expect(
@@ -192,8 +182,8 @@ enum E2 { three, four }''');
   Future<void> test_ENUM_CONSTANT() async {
     await resolveTestCode('''
 @deprecated
-enum _E1 { one, two }
-enum E2 { three, four }''');
+enum _E1 { /*[0*/one/*0]*/, two }
+enum E2 { /*[1*/three/*1]*/, four }''');
     {
       var engineElement = findElement2.field('one');
       // create notification Element
@@ -203,10 +193,8 @@ enum E2 { three, four }''');
       {
         var location = element.location!;
         expect(location.file, testFile.path);
-        expect(location.offset, 23);
         expect(location.length, 'one'.length);
-        expect(location.startLine, 2);
-        expect(location.startColumn, 12);
+        _expectLocation(location, parsedTestCode.ranges[0]);
       }
       expect(element.parameters, isNull);
       expect(element.returnType, '_E1');
@@ -227,10 +215,8 @@ enum E2 { three, four }''');
       {
         var location = element.location!;
         expect(location.file, testFile.path);
-        expect(location.offset, 44);
         expect(location.length, 'three'.length);
-        expect(location.startLine, 3);
-        expect(location.startColumn, 11);
+        _expectLocation(location, parsedTestCode.ranges[1]);
       }
       expect(element.parameters, isNull);
       expect(element.returnType, 'E2');
@@ -259,7 +245,7 @@ enum E2 { three, four }''');
   Future<void> test_FIELD() async {
     await resolveTestCode('''
 class A {
-  static const myField = 42;
+  static const [!myField!] = 42;
 }''');
     var engineElement = findElement2.field('myField');
     // create notification Element
@@ -269,10 +255,8 @@ class A {
     {
       var location = element.location!;
       expect(location.file, testFile.path);
-      expect(location.offset, 25);
       expect(location.length, 'myField'.length);
-      expect(location.startLine, 2);
-      expect(location.startColumn, 16);
+      _expectLocation(location, parsedTestCode.range);
     }
     expect(element.parameters, isNull);
     expect(element.returnType, 'int');
@@ -353,7 +337,7 @@ typedef int F<T>(String x);
     verifyNoTestUnitErrors = false;
     await resolveTestCode('''
 class A {
-  String get myGetter => 42;
+  String get [!myGetter!] => 42;
 }''');
     var engineElement = findElement2.getter('myGetter');
     // create notification Element
@@ -363,10 +347,8 @@ class A {
     {
       var location = element.location!;
       expect(location.file, testFile.path);
-      expect(location.offset, 23);
       expect(location.length, 'myGetter'.length);
-      expect(location.startLine, 2);
-      expect(location.startColumn, 14);
+      _expectLocation(location, parsedTestCode.range);
     }
     expect(element.parameters, isNull);
     expect(element.returnType, 'String');
@@ -376,7 +358,7 @@ class A {
   Future<void> test_LABEL() async {
     await resolveTestCode('''
 void f() {
-myLabel:
+[!myLabel!]:
   while (true) {
     break myLabel;
   }
@@ -389,10 +371,8 @@ myLabel:
     {
       var location = element.location!;
       expect(location.file, testFile.path);
-      expect(location.offset, 11);
       expect(location.length, 'myLabel'.length);
-      expect(location.startLine, 2);
-      expect(location.startColumn, 1);
+      _expectLocation(location, parsedTestCode.range);
     }
     expect(element.parameters, isNull);
     expect(element.returnType, isNull);
@@ -402,7 +382,7 @@ myLabel:
   Future<void> test_METHOD() async {
     await resolveTestCode('''
 class A {
-  static List<String> myMethod(int a, {String? b, int? c}) {
+  static List<String> [!myMethod!](int a, {String? b, int? c}) {
     return [];
   }
 }''');
@@ -414,10 +394,8 @@ class A {
     {
       var location = element.location!;
       expect(location.file, testFile.path);
-      expect(location.offset, 32);
       expect(location.length, 'myGetter'.length);
-      expect(location.startLine, 2);
-      expect(location.startColumn, 23);
+      _expectLocation(location, parsedTestCode.range);
     }
     expect(element.parameters, '(int a, {String? b, int? c})');
     expect(element.returnType, 'List<String>');
@@ -451,7 +429,7 @@ mixin A {}
   Future<void> test_SETTER() async {
     await resolveTestCode('''
 class A {
-  set mySetter(String x) {}
+  set [!mySetter!](String x) {}
 }''');
     var engineElement = findElement2.setter('mySetter');
     // create notification Element
@@ -461,15 +439,20 @@ class A {
     {
       var location = element.location!;
       expect(location.file, testFile.path);
-      expect(location.offset, 16);
       expect(location.length, 'mySetter'.length);
-      expect(location.startLine, 2);
-      expect(location.startColumn, 7);
+      _expectLocation(location, parsedTestCode.range);
     }
     expect(element.parameters, '(String x)');
     expect(element.returnType, isNull);
     expect(element.flags, 0);
   }
+
+  void _expectLocation(Location actual, TestCodeRange expected) {
+    expect(actual.offset, expected.sourceRange.offset);
+    // LSP uses zero-based line/col, but server does uses one-based.
+    expect(actual.startLine, expected.range.start.line + 1);
+    expect(actual.startColumn, expected.range.start.character + 1);
+  }
 }
 
 @reflectiveTest

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

@@ -21,12 +21,6 @@ class IgnoreDiagnosticAnalysisOptionFileTest extends FixProcessorTest {
   @override
   FixKind get kind => ignoreErrorAnalysisFileKind;
 
-  @override
-  void setUp() {
-    useLineEndingsForPlatform = true;
-    super.setUp();
-  }
-
   Future<void> test_addFixToExistingErrorMap() async {
     createAnalysisOptionsFile(errors: {'unused_label': 'ignore'});
 

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

@@ -179,14 +179,13 @@ var v = [const A(), B()];
   }
 
   Future<void> test_recursive_alternating() async {
-    useLineEndingsForPlatform = false;
     await resolveTestCode(r'''
 class A {
   const A();
 }
 class B {}
 Object f() {
-  return const [A(), B(), [A(), B()]];
+  return const [A(), /*0*/B(), [A(), /*1*/B()]];
 }
 ''');
     await assertHasFix(
@@ -201,7 +200,7 @@ Object f() {
 ''',
       errorFilter:
           (error) =>
-              error.offset == testCode.indexOf('B()') &&
+              error.offset == parsedTestCode.positions[0].offset &&
               error.errorCode == CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT,
     );
     await assertHasFix(
@@ -216,20 +215,19 @@ Object f() {
 ''',
       errorFilter:
           (error) =>
-              error.offset == testCode.lastIndexOf('B()') &&
+              error.offset == parsedTestCode.positions[1].offset &&
               error.errorCode == CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT,
     );
   }
 
   Future<void> test_recursive_equal() async {
-    useLineEndingsForPlatform = false;
     await resolveTestCode(r'''
 class A {
   const A();
 }
 class B {}
 Object f() {
-  return const [A(), B(), [A(), A()]];
+  return const [A(), ^B(), [A(), A()]];
 }
 ''');
     await assertHasFix(
@@ -244,7 +242,7 @@ Object f() {
 ''',
       errorFilter:
           (error) =>
-              error.offset == testCode.indexOf('B()') &&
+              error.offset == parsedTestCode.position.offset &&
               error.errorCode == CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT,
     );
   }