Extract the lexeme from included suggestion tags when correlating with model results

lambdabaa · commit-bot@chromium.org · commit d19a590687d8 · 2019-08-07T20:40:55.000Z
Make sure that we're comparing model lexeme to analyzer lexeme since https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart#L226. Change-Id: I01d93623fb09ecc169be92674b58a91ef0bf56ff Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112263 Commit-Queue: Ari Aye <ariaye@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking.dart
@@ -138,7 +138,8 @@ class CompletionRanking {
       List<IncludedSuggestionRelevanceTag> includedSuggestions;
       if (includedSuggestionRelevanceTags != null) {
         includedSuggestions = includedSuggestionRelevanceTags
-            .where((tag) => areCompletionsEquivalent(tag.tag, entry.key))
+            .where((tag) => areCompletionsEquivalent(
+                elementNameFromRelevanceTag(tag.tag), entry.key))
             .toList();
       } else {
         includedSuggestions = [];
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart
@@ -168,3 +168,14 @@ List<String> constructQuery(DartCompletionRequest request, int n) {
 
   return result.reversed.toList(growable: false);
 }
+
+/// Maps included relevance tags formatted as
+/// '${element.librarySource.uri}::${element.name}' to element.name.
+String elementNameFromRelevanceTag(String tag) {
+  final index = tag.lastIndexOf('::');
+  if (index == -1) {
+    return null;
+  }
+
+  return tag.substring(index + 2);
+}
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_ranking_internal_test.dart b/pkg/analysis_server/test/services/completion/dart/completion_ranking_internal_test.dart
@@ -193,4 +193,10 @@ void main() {
     when(target.entity).thenReturn(two);
     expect(constructQuery(request, 100), equals(['class', 'Animal']));
   });
+
+  test('elementNameFromRelevanceTag', () {
+    final tag =
+        'package::flutter/src/widgets/preferred_size.dart::::PreferredSizeWidget';
+    expect(elementNameFromRelevanceTag(tag), equals('PreferredSizeWidget'));
+  });
 }
