Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-03-30 13:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable not sending isIncomplete optimization

Browse Source
This commit is contained in:
Jacob Dufault 2017-09-25 14:33:28 -07:00
parent c5651a1dbf
commit d57ecff497
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/command_line.cc
View File

@ -425,6 +425,7 @@ void FilterCompletionResponse(Out_TextDocumentComplete* complete_response,
std::unordered_set<std::string> inserted; std::unordered_set<std::string> inserted;
inserted.reserve(kMaxResultSize); inserted.reserve(kMaxResultSize);
// Find literal matches first.
for (const lsCompletionItem& item : complete_response->result.items) { for (const lsCompletionItem& item : complete_response->result.items) {
if (item.label.find(complete_text) != std::string::npos) { if (item.label.find(complete_text) != std::string::npos) {
// Don't insert the same completion entry. // Don't insert the same completion entry.
@ -437,6 +438,7 @@ void FilterCompletionResponse(Out_TextDocumentComplete* complete_response,
} }
} }
// Find fuzzy matches if we haven't found all of the literal matches.
if (filtered_result.size() < kMaxResultSize) { if (filtered_result.size() < kMaxResultSize) {
for (const lsCompletionItem& item : complete_response->result.items) { for (const lsCompletionItem& item : complete_response->result.items) {
if (SubstringMatch(complete_text, item.label)) { if (SubstringMatch(complete_text, item.label)) {
@ -457,7 +459,9 @@ void FilterCompletionResponse(Out_TextDocumentComplete* complete_response,
// matches against oa), our filtering is guaranteed to contain any // matches against oa), our filtering is guaranteed to contain any
// potential matches, so the completion is only incomplete if we have the // potential matches, so the completion is only incomplete if we have the
// max number of emitted matches. // max number of emitted matches.
if (complete_response->result.items.size() >= kMaxResultSize) { // TODO: This is currently disabled, as it seems to be missing some
// results, esp with global completion.
if (true || filtered_result.size() >= kMaxResultSize) {
LOG_S(INFO) << "Marking completion results as incomplete"; LOG_S(INFO) << "Marking completion results as incomplete";
complete_response->result.isIncomplete = true; complete_response->result.isIncomplete = true;
} }
@ -1040,11 +1044,11 @@ bool IndexMergeIndexUpdates(QueueManager* queue) {
did_merge = true; did_merge = true;
Timer time; Timer time;
root->update.Merge(to_join->update); root->update.Merge(to_join->update);
time.ResetAndPrint("Joined querydb updates for files: " + //time.ResetAndPrint("Joined querydb updates for files: " +
StringJoinMap(root->update.files_def_update, //StringJoinMap(root->update.files_def_update,
[](const QueryFile::DefUpdate& update) { //[](const QueryFile::DefUpdate& update) {
return update.path; //return update.path;
})); //}));
} }
} }