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

Compare hover & comments in {Func,Type,Var}DefDefinitionData::operator==

Browse Source 
So that the changes populate to querydb.
Also expand two std::set_difference calls to save one scan
This commit is contained in:
Fangrui Song 2018-01-01 12:36:08 -08:00
parent 0539e4249b
commit 6fa92f7968
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/indexer.h
View File

@ -183,7 +183,8 @@ struct TypeDefDefinitionData {
definition_spelling == other.definition_spelling && definition_spelling == other.definition_spelling &&
definition_extent == other.definition_extent && definition_extent == other.definition_extent &&
alias_of == other.alias_of && parents == other.parents && alias_of == other.alias_of && parents == other.parents &&
types == other.types && funcs == other.funcs && vars == other.vars; types == other.types && funcs == other.funcs && vars == other.vars &&
hover == other.hover && comments == other.comments;
} }
bool operator!=( bool operator!=(
@ -276,7 +277,8 @@ struct FuncDefDefinitionData {
definition_spelling == other.definition_spelling && definition_spelling == other.definition_spelling &&
definition_extent == other.definition_extent && definition_extent == other.definition_extent &&
declaring_type == other.declaring_type && base == other.base && declaring_type == other.declaring_type && base == other.base &&
locals == other.locals && callees == other.callees; locals == other.locals && callees == other.callees &&
hover == other.hover && comments == other.comments;
} }
bool operator!=( bool operator!=(
const FuncDefDefinitionData<TypeId, FuncId, VarId, FuncRef, Range>& other) const FuncDefDefinitionData<TypeId, FuncId, VarId, FuncRef, Range>& other)
@ -405,7 +407,8 @@ struct VarDefDefinitionData {
definition_spelling == other.definition_spelling && definition_spelling == other.definition_spelling &&
definition_extent == other.definition_extent && definition_extent == other.definition_extent &&
variable_type == other.variable_type && variable_type == other.variable_type &&
declaring_type == other.declaring_type; declaring_type == other.declaring_type && hover == other.hover &&
comments == other.comments;
} }
bool operator!=( bool operator!=(
const VarDefDefinitionData<TypeId, FuncId, VarId, Range>& other) const { const VarDefDefinitionData<TypeId, FuncId, VarId, Range>& other) const {

21
src/query.cc
View File

@ -118,12 +118,21 @@ bool ComputeDifferenceForUpdate(std::vector<T>& previous,
std::sort(previous.begin(), previous.end()); std::sort(previous.begin(), previous.end());
std::sort(current.begin(), current.end()); std::sort(current.begin(), current.end());
// Returns the elements in |previous| that are not in |current|. auto it0 = previous.begin(), it1 = current.begin();
std::set_difference(previous.begin(), previous.end(), current.begin(), while (it0 != previous.end() && it1 != current.end()) {
current.end(), std::back_inserter(*removed)); // Elements in |previous| that are not in |current|.
// Returns the elements in |current| that are not in |previous|. if (*it0 < *it1)
std::set_difference(current.begin(), current.end(), previous.begin(), removed->push_back(*it0++);
previous.end(), std::back_inserter(*added)); // Elements in |current| that are not in |previous|.
else if (*it1 < *it0)
added->push_back(*it1++);
else
++it0, ++it1;
}
while (it0 != previous.end())
removed->push_back(*it0++);
while (it1 != current.end())
added->push_back(*it1++);
return !removed->empty() || !added->empty(); return !removed->empty() || !added->empty();
} }