Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 15:45:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix include completion.

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-15 02:07:01 -08:00
parent 159b0b968d
commit 2ad7ac10ab
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/messages/text_document_completion.cc
View File

@ -268,18 +268,6 @@ struct TextDocumentCompletionHandler : MessageHandler {
&existing_completion); &existing_completion);
} }
//If existing completion is empty, dont return completion results
//Only do this when trigger is not manual or context doesn't exist
//(for Atom support)
if (existing_completion.empty() && is_global_completion && (!(request->params.context) ||
request->params.context->triggerKind == lsCompletionTriggerKind::TriggerCharacter)) {
LOG_S(INFO) << "Existing completion is empty, no completion results will be returned";
Out_TextDocumentComplete out;
out.id = request->id;
QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out);
return;
}
if (ShouldRunIncludeCompletion(buffer_line)) { if (ShouldRunIncludeCompletion(buffer_line)) {
Out_TextDocumentComplete out; Out_TextDocumentComplete out;
out.id = request->id; out.id = request->id;
@ -303,9 +291,24 @@ struct TextDocumentCompletionHandler : MessageHandler {
} }
} }
TrimInPlace(buffer_line);
SortAndFilterCompletionResponse(&out, buffer_line); SortAndFilterCompletionResponse(&out, buffer_line);
QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out); QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out);
} else { } else {
// If existing completion is empty, dont return clang-based completion
// results Only do this when trigger is not manual or context doesn't
// exist (for Atom support).
if (existing_completion.empty() && is_global_completion &&
(!request->params.context || request->params.context->triggerKind ==
lsCompletionTriggerKind::Invoked)) {
LOG_S(INFO) << "Existing completion is empty, no completion results "
"will be returned";
Out_TextDocumentComplete out;
out.id = request->id;
QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out);
return;
}
ClangCompleteManager::OnComplete callback = std::bind( ClangCompleteManager::OnComplete callback = std::bind(
[this, is_global_completion, existing_completion, request]( [this, is_global_completion, existing_completion, request](
const std::vector<lsCompletionItem>& results, const std::vector<lsCompletionItem>& results,