ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Fixed click on macro activated first of multiple symbols instead of showing list

Browse Source
This commit is contained in:
Eberhard Graether
2018-07-25 20:53:54 +02:00
parent eda86dc44a
commit b055b4c7dc
1 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/storage/PersistentStorage.cpp
+12 -34
View File
@@ -1287,39 +1287,27 @@ std::vector<Id> PersistentStorage::getNodeIdsForLocationIds(const std::vector<Id
{
TRACE();
std::set<Id> edgeIds;
std::set<Id> nodeIds;
std::set<Id> implicitEdgeIds;
std::set<Id> implicitNodeIds;
for (const StorageOccurrence& occurrence: m_sqliteIndexStorage.getOccurrencesForLocationIds(locationIds))
{
const Id elementId = occurrence.elementId;
Id elementId = occurrence.elementId;
const StorageEdge edge = m_sqliteIndexStorage.getFirstById<StorageEdge>(elementId);
if (edge.id != 0)
{
auto it = m_symbolDefinitionKinds.find(edge.targetNodeId);
if (it != m_symbolDefinitionKinds.end() && it->second == DEFINITION_IMPLICIT)
{
implicitEdgeIds.insert(edge.targetNodeId);
}
else
{
edgeIds.insert(edge.targetNodeId);
}
elementId = edge.targetNodeId;
}
else if (m_sqliteIndexStorage.isNode(elementId))
auto it = m_symbolDefinitionKinds.find(elementId);
if (it != m_symbolDefinitionKinds.end() && it->second == DEFINITION_IMPLICIT)
{
auto it = m_symbolDefinitionKinds.find(elementId);
if (it != m_symbolDefinitionKinds.end() && it->second == DEFINITION_IMPLICIT)
{
implicitNodeIds.insert(elementId);
}
else
{
nodeIds.insert(elementId);
}
implicitNodeIds.insert(elementId);
}
else
{
nodeIds.insert(elementId);
}
}
@@ -1327,18 +1315,8 @@ std::vector<Id> PersistentStorage::getNodeIdsForLocationIds(const std::vector<Id
{
return utility::toVector(nodeIds);
}
else if (implicitNodeIds.size())
{
return utility::toVector(implicitNodeIds);
}
else if (edgeIds.size())
{
return utility::toVector(edgeIds);
}
else
{
return utility::toVector(implicitEdgeIds);
}
return utility::toVector(implicitNodeIds);
}
std::shared_ptr<SourceLocationCollection> PersistentStorage::getSourceLocationsForTokenIds(