From af3c09d00dbbfc133530fce7d6152b26b5881828 Mon Sep 17 00:00:00 2001
From: Jacob Dufault <jacobdufault@gmail.com>
Date: Mon, 19 Mar 2018 19:50:22 -0700
Subject: [PATCH] Restore include completion on #

---
 src/messages/text_document_completion.cc | 47 +++++++++++-------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/messages/text_document_completion.cc b/src/messages/text_document_completion.cc
index cf430005..c14e360f 100644
--- a/src/messages/text_document_completion.cc
+++ b/src/messages/text_document_completion.cc
@@ -115,7 +115,7 @@ ParseIncludeLineResult ParseIncludeLine(const std::string& line) {
       "(.*)");        // [7]: suffix after quote char
   std::smatch match;
   bool ok = std::regex_match(line, match, pattern);
-  std::string text = match[6].str();
+  std::string text = match[3].str() + match[6].str();
   return {ok, text, match};
 }
 
@@ -298,33 +298,30 @@ struct TextDocumentCompletionHandler : MessageHandler {
       Out_TextDocumentComplete out;
       out.id = request->id;
 
-      std::string text = result.match[3];
-      if (std::string_view("include").compare(0, text.size(), text) == 0) {
-        {
-          std::unique_lock<std::mutex> lock(
-            include_complete->completion_items_mutex, std::defer_lock);
-          if (include_complete->is_scanning)
-            lock.lock();
-          std::string quote = result.match[5];
-          for (auto& item : include_complete->completion_items)
-            if (quote.empty() || quote == (item.use_angle_brackets_ ? "<" : "\""))
-              out.result.items.push_back(item);
-        }
+      {
+        std::unique_lock<std::mutex> lock(
+          include_complete->completion_items_mutex, std::defer_lock);
+        if (include_complete->is_scanning)
+          lock.lock();
+        std::string quote = result.match[5];
+        for (auto& item : include_complete->completion_items)
+          if (quote.empty() || quote == (item.use_angle_brackets_ ? "<" : "\""))
+            out.result.items.push_back(item);
+      }
 
-        // Needed by |FilterAndSortCompletionResponse|.
-        for (lsCompletionItem& item : out.result.items)
-          item.filterText = item.label;
+      // Needed by |FilterAndSortCompletionResponse|.
+      for (lsCompletionItem& item : out.result.items)
+        item.filterText = item.label;
 
-        FilterAndSortCompletionResponse(&out, result.pattern,
-          config->completion.filterAndSort);
-        DecorateIncludePaths(result.match, &out.result.items);
+      FilterAndSortCompletionResponse(&out, result.pattern,
+        config->completion.filterAndSort);
+      DecorateIncludePaths(result.match, &out.result.items);
 
-        for (lsCompletionItem& item : out.result.items) {
-          item.textEdit->range.start.line = request->params.position.line;
-          item.textEdit->range.start.character = 0;
-          item.textEdit->range.end.line = request->params.position.line;
-          item.textEdit->range.end.character = (int)buffer_line.size();
-        }
+      for (lsCompletionItem& item : out.result.items) {
+        item.textEdit->range.start.line = request->params.position.line;
+        item.textEdit->range.start.character = 0;
+        item.textEdit->range.end.line = request->params.position.line;
+        item.textEdit->range.end.character = (int)buffer_line.size();
       }
 
       QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out);