From b66625e0784f40eb76b0cdaea0fc317b41f95e51 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Thu, 22 Nov 2018 23:57:04 -0800
Subject: [PATCH] completion: delete insertText; don't set filterText if it is
 the same as label

On a `std::` completion case, it decreases Content-Length: from 32K to 25K
---
 src/message_handler.hh                  |  1 -
 src/messages/textDocument_completion.cc | 30 ++++++++++---------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/message_handler.hh b/src/message_handler.hh
index bac8b1b9..2cbee9be 100644
--- a/src/message_handler.hh
+++ b/src/message_handler.hh
@@ -122,7 +122,6 @@ struct CompletionItem {
   std::optional<std::string> documentation;
   std::string sortText;
   std::optional<std::string> filterText;
-  std::string insertText;
   InsertTextFormat insertTextFormat = InsertTextFormat::PlainText;
   TextEdit textEdit;
   std::vector<TextEdit> additionalTextEdits;
diff --git a/src/messages/textDocument_completion.cc b/src/messages/textDocument_completion.cc
index 5748b8bd..4591cdea 100644
--- a/src/messages/textDocument_completion.cc
+++ b/src/messages/textDocument_completion.cc
@@ -35,8 +35,8 @@ using namespace llvm;
 MAKE_REFLECT_TYPE_PROXY(InsertTextFormat);
 MAKE_REFLECT_TYPE_PROXY(CompletionItemKind);
 MAKE_REFLECT_STRUCT(CompletionItem, label, kind, detail, documentation,
-                    sortText, filterText, insertText, insertTextFormat,
-                    textEdit, additionalTextEdits);
+                    sortText, filterText, insertTextFormat, textEdit,
+                    additionalTextEdits);
 
 namespace {
 struct CompletionList {
@@ -141,11 +141,11 @@ void FilterCandidates(CompletionList &result, const std::string &complete_text,
         }
         edits.erase(edits.begin());
       }
+      if (item.filterText == item.label)
+        item.filterText.reset();
       for (auto i = sort.size(); i && ++sort[i - 1] == 'A';)
         sort[--i] = ' ';
       item.sortText = sort;
-      // Compatibility
-      item.insertText = item.textEdit.newText;
     }
   };
 
@@ -155,20 +155,14 @@ void FilterCandidates(CompletionList &result, const std::string &complete_text,
     return;
   }
 
-  // Make sure all items have |filterText| set, code that follow needs it.
-  for (auto &item : items) {
-    if (!item.filterText)
-      item.filterText = item.label;
-  }
-
   // Fuzzy match and remove awful candidates.
   bool sensitive = g_config->completion.caseSensitivity;
   FuzzyMatcher fuzzy(complete_text, sensitive);
-  for (auto &item : items) {
-    item.score_ =
-        ReverseSubseqMatch(complete_text, *item.filterText, sensitive) >= 0
-            ? fuzzy.Match(*item.filterText)
-            : FuzzyMatcher::kMinScore;
+  for (CompletionItem &item : items) {
+    const std::string &filter = item.filterText ? *item.filterText : item.label;
+    item.score_ = ReverseSubseqMatch(complete_text, filter, sensitive) >= 0
+                      ? fuzzy.Match(filter)
+                      : FuzzyMatcher::kMinScore;
   }
   items.erase(std::remove_if(items.begin(), items.end(),
                              [](const CompletionItem &item) {
@@ -185,9 +179,9 @@ void FilterCandidates(CompletionList &result, const std::string &complete_text,
                 return lhs.score_ > rhs.score_;
               if (lhs.priority_ != rhs.priority_)
                 return lhs.priority_ < rhs.priority_;
-              if (lhs.filterText->size() != rhs.filterText->size())
-                return lhs.filterText->size() < rhs.filterText->size();
-              return *lhs.filterText < *rhs.filterText;
+              if (lhs.label.size() != rhs.label.size())
+                return lhs.label.size() < rhs.label.size();
+              return lhs.label < rhs.label;
             });
 
   // Trim result.