[cq] Remove the last uses of a comment-based cursor position

Change-Id: Ie5e9c81a6e35cd5da411620dacdbea5429ca454c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/414460
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: bwilkerson

pkg/analysis_server/doc/implementation/quick_assist.md

@@ -173,15 +173,15 @@ The test can then be written in a method that looks something like this:
 ```dart
 Future<void> test_positive() async {
   await resolveTestCode('''
-var c = /*caret*/42;
+var c = ^42;
 ''');
   await assertHasAssist('''
 var c = 0x2a;
 ''');
 }
 ```
 
-The test framework will look for the marker `/*caret*/`, remember it's offset,
+The test framework will look for the marker `^`, remember it's offset,
 create a file containing the first piece of code with the marker removed, run
 the assist over the code, use our correction producer to build an edit, apply
 the edit to the file, and textually compare the results with the second piece of

pkg/analysis_server/test/edit/statement_completion_test.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/protocol/protocol_generated.dart';
+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';
@@ -62,7 +63,7 @@ void f() {
     _assertHasChange('Insert a newline at the end of the current line', '''
 void f() {
   int v = 1;
-  /*caret*/
+  ^
 }
 ''');
   }
@@ -78,7 +79,7 @@ void f() {
     _assertHasChange('Insert a newline at the end of the current line', '''
 void f() {
   int v = 1;
-  /*caret*/
+  ^
 }
 ''');
   }
@@ -92,38 +93,25 @@ void f() {
     await waitForTasksFinished();
     var match = 'v =';
     await _prepareCompletion(match, atEnd: true);
-    _assertHasChange(
-      'Insert a newline at the end of the current line',
-      '''
+    _assertHasChange('Insert a newline at the end of the current line', '''
 void f() {
-  int v =
+  int v =^
   x
 }
-''',
-      (s) => s.indexOf(match) + match.length,
-    ); // Ensure cursor after '='.
+''');
   }
 
-  void _assertHasChange(
-    String message,
-    String expectedCode, [
-    int Function(String)? cmp,
-  ]) {
+  void _assertHasChange(String message, String expectedCode) {
     if (change.message == message) {
       if (change.edits.isNotEmpty) {
         var resultCode = SourceEdit.applySequence(
           testFileContent,
           change.edits[0].edits,
         );
-        expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
-        if (cmp != null) {
-          var offset = cmp(resultCode);
-          expect(change.selection!.offset, offset);
-        }
-      } else {
-        if (cmp != null) {
-          var offset = cmp(testFileContent);
-          expect(change.selection!.offset, offset);
+        var parsedExpected = TestCode.parse(expectedCode);
+        expect(resultCode, parsedExpected.code);
+        if (parsedExpected.positions.isNotEmpty) {
+          expect(change.selection!.offset, parsedExpected.position.offset);
         }
       }
       return;