From 66325538f4f1de4eaeeb5792efd4f60e5fd4a36d Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Thu, 8 Nov 2018 21:18:41 -0800
Subject: [PATCH] Use Sema::CodeCompleteIncludedFile if clang >= 8

---
 src/messages/textDocument_completion.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/messages/textDocument_completion.cc b/src/messages/textDocument_completion.cc
index d89e4f03..5748b8bd 100644
--- a/src/messages/textDocument_completion.cc
+++ b/src/messages/textDocument_completion.cc
@@ -125,7 +125,7 @@ void FilterCandidates(CompletionList &result, const std::string &complete_text,
     for (auto &item : items) {
       item.textEdit.range = lsRange{begin_pos, end_pos};
       if (has_open_paren && item.filterText)
-        item.textEdit.newText = item.filterText.value();
+        item.textEdit.newText = *item.filterText;
       // https://github.com/Microsoft/language-server-protocol/issues/543
       // Order of textEdit and additionalTextEdits is unspecified.
       auto &edits = item.additionalTextEdits;
@@ -137,7 +137,7 @@ void FilterCandidates(CompletionList &result, const std::string &complete_text,
           item.filterText =
               buffer_line.substr(start.character,
                                  end.character - start.character) +
-              item.filterText.value();
+              *item.filterText;
         }
         edits.erase(edits.begin());
       }