Issue 51762. Update CompletionResponsePrinter sorting.

Bug: #51762
Change-Id: I46019bea72ac1656c97acb9da88da7dc577d8ef5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/292640
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

pkg/analysis_server/test/domain_completion_test.dart

@@ -474,6 +474,8 @@ suggestions
 
   Future<void> test_notImported_lowerRelevance_extension_getter() async {
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     newFile('$testPackageLibPath/a.dart', '''
 extension E1 on int {
@@ -513,6 +515,8 @@ suggestions
 
   Future<void> test_notImported_lowerRelevance_extension_method() async {
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     newFile('$testPackageLibPath/a.dart', '''
 extension E1 on int {
@@ -552,6 +556,8 @@ suggestions
 
   Future<void> test_notImported_lowerRelevance_extension_setter() async {
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     newFile('$testPackageLibPath/a.dart', '''
 extension E1 on int {
@@ -599,6 +605,8 @@ class A02 {}
 ''');
 
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     var response = await _getTestCodeSuggestions('''
 import 'b.dart';
@@ -634,6 +642,8 @@ int get foo02 => 0;
 ''');
 
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     var response = await _getTestCodeSuggestions('''
 import 'b.dart';
@@ -669,6 +679,8 @@ set foo02(int _) {}
 ''');
 
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     var response = await _getTestCodeSuggestions('''
 import 'b.dart';
@@ -704,6 +716,8 @@ var foo02 = 0;
 ''');
 
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     var response = await _getTestCodeSuggestions('''
 import 'b.dart';
@@ -919,6 +933,8 @@ class A03 {}
 ''');
 
     await _configureWithWorkspaceRoot();
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
 
     var response = await _getTestCodeSuggestions('''
 import 'a.dart' show A02;

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

@@ -25,6 +25,32 @@ class CompletionResponsePrinter {
     _writeSuggestions();
   }
 
+  /// Compares suggestions according to the configuration sorting.
+  int _compareSuggestions(CompletionSuggestion a, CompletionSuggestion b) {
+    int completionThenKind() {
+      final completionDiff = a.completion.compareTo(b.completion);
+      if (completionDiff != 0) {
+        return completionDiff;
+      } else {
+        return a.kind.name.compareTo(b.kind.name);
+      }
+    }
+
+    switch (configuration.sorting) {
+      case Sorting.asIs:
+        return 0;
+      case Sorting.completionThenKind:
+        return completionThenKind();
+      case Sorting.relevanceThenCompletionThenKind:
+        final relevanceDiff = a.relevance - b.relevance;
+        if (relevanceDiff != 0) {
+          return -relevanceDiff;
+        } else {
+          return completionThenKind();
+        }
+    }
+  }
+
   String _escapeMultiLine(String text) {
     return text.replaceAll('\n', r'\n');
   }
@@ -255,21 +281,7 @@ class CompletionResponsePrinter {
 
   void _writeSuggestions() {
     final filtered = response.suggestions.where(configuration.filter);
-    final sorted = filtered.sorted((a, b) {
-      switch (configuration.sorting) {
-        case Sorting.asIs:
-          return 0;
-        case Sorting.completion:
-          return a.completion.compareTo(b.completion);
-        case Sorting.relevanceThenCompletion:
-          final relevanceDiff = a.relevance - b.relevance;
-          if (relevanceDiff != 0) {
-            return -relevanceDiff;
-          } else {
-            return a.completion.compareTo(b.completion);
-          }
-      }
-    });
+    final sorted = filtered.sorted(_compareSuggestions);
 
     _writelnWithIndent('suggestions');
 
@@ -298,7 +310,7 @@ class Configuration {
   bool Function(CompletionSuggestion suggestion) filter;
 
   Configuration({
-    this.sorting = Sorting.relevanceThenCompletion,
+    this.sorting = Sorting.completionThenKind,
     this.withDisplayText = false,
     this.withDocumentation = false,
     this.withElement = false,
@@ -315,6 +327,6 @@ class Configuration {
 
 enum Sorting {
   asIs,
-  completion,
-  relevanceThenCompletion,
+  completionThenKind,
+  relevanceThenCompletionThenKind,
 }

pkg/analysis_server/test/services/completion/dart/declaration/class_test.dart

@@ -59,6 +59,9 @@ suggestions
   }
 
   Future<void> test_field_hasContextType_subtypes() async {
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
+
     await _checkLocations(
       classCode: r'''
 class A {
@@ -140,6 +143,9 @@ suggestions
   }
 
   Future<void> test_getter_hasContextType_subtypes() async {
+    printerConfiguration.sorting =
+        printer.Sorting.relevanceThenCompletionThenKind;
+
     await _checkLocations(
       classCode: r'''
 class A {