[anaysis_server] Switch completion tests from element offsets to line numbers

The element offsets here are used only to differentiate elements (to check for correct shadowing) so exact positions are not necessary and line numbers will do. This removes offsets that would change if the tests are run with different line endings based on the current platform.

Only one test had two elements on the same line, so I've wrapped the code to keep the test valid.

See #60234

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

Author: DanTup

pkg/analysis_server/test/services/completion/dart/completion_printer.dart

@@ -261,11 +261,12 @@ class CompletionResponsePrinter {
     }
   }
 
-  void _writeElementOffset(CompletionSuggestion suggestion) {
-    if (configuration.withElementOffset) {
+  void _writeElementLocation(CompletionSuggestion suggestion) {
+    if (configuration.withElementLocation) {
       var element = suggestion.element;
       if (element != null) {
-        _writelnWithIndent('offset: ${element.location?.offset}');
+        _writelnWithIndent('line: ${element.location?.startLine}');
+        _writelnWithIndent('column: ${element.location?.startColumn}');
       }
     }
   }
@@ -355,7 +356,7 @@ class CompletionResponsePrinter {
     _writeCompletion(suggestion);
     _withIndent(() {
       _writeSuggestionKind(suggestion);
-      _writeElementOffset(suggestion);
+      _writeElementLocation(suggestion);
       _writeDeclaringType(suggestion);
       _writeDeprecated(suggestion);
       _writeDefaultArgumentList(suggestion);
@@ -400,7 +401,7 @@ class Configuration {
   bool withDisplayText;
   bool withDocumentation;
   bool withElement;
-  bool withElementOffset;
+  bool withElementLocation;
   bool withIsNotImported;
   bool withKind;
   bool withLibraryUri;
@@ -419,7 +420,7 @@ class Configuration {
     this.withDisplayText = false,
     this.withDocumentation = false,
     this.withElement = false,
-    this.withElementOffset = false,
+    this.withElementLocation = false,
     this.withIsNotImported = false,
     this.withKind = true,
     this.withLibraryUri = false,

pkg/analysis_server/test/services/completion/dart/shadowing_test.dart

@@ -37,7 +37,7 @@ mixin ShadowingTestCases on AbstractCompletionDriverTest {
   @override
   Future<void> setUp() async {
     await super.setUp();
-    printerConfiguration.withElementOffset = true;
+    printerConfiguration.withElementLocation = true;
   }
 
   Future<void> test_field_class() async {
@@ -55,7 +55,8 @@ class f0 {}
 suggestions
   f0
     kind: field
-    offset: 19
+    line: 2
+    column: 10
 ''');
   }
 
@@ -74,7 +75,8 @@ class C {
 suggestions
   f0
     kind: field
-    offset: 39
+    line: 4
+    column: 10
 ''');
   }
 
@@ -93,7 +95,8 @@ class C {
 suggestions
   f0
     kind: field
-    offset: 36
+    line: 4
+    column: 10
 ''');
   }
 
@@ -111,7 +114,8 @@ void f() {
 suggestions
   f0
     kind: functionInvocation
-    offset: 49
+    line: 4
+    column: 10
 ''');
   }
 
@@ -129,7 +133,8 @@ void f() {
 suggestions
   v0
     kind: functionInvocation
-    offset: 48
+    line: 4
+    column: 10
 ''');
   }
 
@@ -144,7 +149,8 @@ void f(int v0) {
 suggestions
   v0
     kind: functionInvocation
-    offset: 24
+    line: 2
+    column: 8
 ''');
   }
 
@@ -162,7 +168,8 @@ void f() {
 suggestions
   v0
     kind: localVariable
-    offset: 48
+    line: 4
+    column: 9
 ''');
   }
 
@@ -180,7 +187,8 @@ void f() {
 suggestions
   v0
     kind: localVariable
-    offset: 47
+    line: 4
+    column: 9
 ''');
   }
 
@@ -195,7 +203,8 @@ void f(int v0) {
 suggestions
   v0
     kind: localVariable
-    offset: 23
+    line: 2
+    column: 7
 ''');
   }
 
@@ -210,7 +219,8 @@ void f<v0>() {
 suggestions
   v0
     kind: localVariable
-    offset: 21
+    line: 2
+    column: 7
 ''');
   }
 
@@ -228,7 +238,8 @@ class m0 {}
 suggestions
   m0
     kind: methodInvocation
-    offset: 17
+    line: 2
+    column: 8
 ''');
   }
 
@@ -246,7 +257,8 @@ class C {
 suggestions
   m0
     kind: methodInvocation
-    offset: 31
+    line: 4
+    column: 8
 ''');
   }
 
@@ -264,7 +276,8 @@ class C {
 suggestions
   m0
     kind: methodInvocation
-    offset: 30
+    line: 4
+    column: 8
 ''');
   }
 
@@ -280,7 +293,8 @@ class c0 {
 suggestions
   c0
     kind: parameter
-    offset: 24
+    line: 2
+    column: 14
 ''');
   }
 
@@ -297,7 +311,8 @@ class C {
 suggestions
   f0
     kind: parameter
-    offset: 41
+    line: 3
+    column: 14
 ''');
   }
 
@@ -314,7 +329,8 @@ class C {
 suggestions
   m0
     kind: parameter
-    offset: 44
+    line: 3
+    column: 14
 ''');
   }
 
@@ -329,7 +345,8 @@ void f(int f0) {
 suggestions
   f0
     kind: parameter
-    offset: 30
+    line: 2
+    column: 12
 ''');
   }
 
@@ -344,7 +361,8 @@ void f(int f0) {
 suggestions
   f0
     kind: parameter
-    offset: 27
+    line: 2
+    column: 12
 ''');
   }
 
@@ -358,7 +376,8 @@ void f<p0>(int p0) {
 suggestions
   p0
     kind: parameter
-    offset: 15
+    line: 1
+    column: 16
 ''');
   }
 
@@ -375,7 +394,8 @@ void f() {
 suggestions
   v0
     kind: typeParameter
-    offset: 34
+    line: 3
+    column: 10
 ''');
   }
 
@@ -391,7 +411,8 @@ void f(int p0) {
 suggestions
   p0
     kind: typeParameter
-    offset: 26
+    line: 2
+    column: 10
 ''');
   }
 
@@ -407,7 +428,8 @@ void f<p0>() {
 suggestions
   p0
     kind: typeParameter
-    offset: 24
+    line: 2
+    column: 10
 ''');
   }
 }