Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-25 09:05:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved lines above

Browse Source
This commit is contained in:
rianneogi 2018-01-12 13:39:58 +05:30 committed by Jacob Dufault
parent 2f8d11e5ff
commit 27dad9a277
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ waf-*
waf2* waf2*
waf3* waf3*
x64 x64
cquery_log.txt

40
src/messages/text_document_completion.cc
View File

@ -260,6 +260,26 @@ struct TextDocumentCompletionHandler : MessageHandler {
} }
} }
bool is_global_completion = false;
std::string existing_completion;
if (file) {
request->params.position = file->FindStableCompletionSource(
request->params.position, &is_global_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;
@ -286,30 +306,10 @@ struct TextDocumentCompletionHandler : MessageHandler {
SortAndFilterCompletionResponse(&out, buffer_line); SortAndFilterCompletionResponse(&out, buffer_line);
QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out); QueueManager::WriteStdout(IpcId::TextDocumentCompletion, out);
} else { } else {
bool is_global_completion = false;
std::string existing_completion;
if (file) {
request->params.position = file->FindStableCompletionSource(
request->params.position, &is_global_completion,
&existing_completion);
}
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,
bool is_cached_result) { bool is_cached_result) {
//If existing completion is empty, dont return completion results
//Only do this when trigger is not manual and 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;
}
Out_TextDocumentComplete out; Out_TextDocumentComplete out;
out.id = request->id; out.id = request->id;
out.result.items = results; out.result.items = results;