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

logic: Fixed click on call location of implicit template specialization leads nowhere

Browse Source
This commit is contained in:
Eberhard Graether
2017-09-15 12:44:22 +02:00
parent 8beb516b80
commit 4731f379f4
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/storage/PersistentStorage.cpp
+24 -14
View File
@@ -1159,6 +1159,8 @@ std::vector<Id> PersistentStorage::getNodeIdsForLocationIds(const std::vector<Id
std::set<Id> edgeIds;
std::set<Id> nodeIds;
std::set<Id> implicitEdgeIds;
std::set<Id> implicitNodeIds;
for (const StorageOccurrence& occurrence: m_sqliteIndexStorage.getOccurrencesForLocationIds(locationIds))
{
@@ -1170,20 +1172,24 @@ std::vector<Id> PersistentStorage::getNodeIdsForLocationIds(const std::vector<Id
auto it = m_symbolDefinitionKinds.find(edge.targetNodeId);
if (it != m_symbolDefinitionKinds.end() && it->second == DEFINITION_IMPLICIT)
{
continue;
implicitEdgeIds.insert(edge.targetNodeId);
}
else
{
edgeIds.insert(edge.targetNodeId);
}
edgeIds.insert(edge.targetNodeId);
}
else if (m_sqliteIndexStorage.isNode(elementId))
{
auto it = m_symbolDefinitionKinds.find(elementId);
if (it != m_symbolDefinitionKinds.end() && it->second == DEFINITION_IMPLICIT)
{
continue;
implicitNodeIds.insert(elementId);
}
else
{
nodeIds.insert(elementId);
}
nodeIds.insert(elementId);
}
}
@@ -1191,8 +1197,18 @@ std::vector<Id> PersistentStorage::getNodeIdsForLocationIds(const std::vector<Id
{
return utility::toVector(nodeIds);
}
return utility::toVector(edgeIds);
else if (implicitNodeIds.size())
{
return utility::toVector(implicitNodeIds);
}
else if (edgeIds.size())
{
return utility::toVector(edgeIds);
}
else
{
return utility::toVector(implicitEdgeIds);
}
}
std::shared_ptr<SourceLocationCollection> PersistentStorage::getSourceLocationsForTokenIds(
@@ -1845,12 +1861,6 @@ TooltipInfo PersistentStorage::getTooltipInfoForSourceLocationIdsAndLocalSymbolI
for (const StorageNode& node : m_sqliteIndexStorage.getAllByIds<StorageNode>(tokenIds))
{
auto it = m_symbolDefinitionKinds.find(node.id);
if (it != m_symbolDefinitionKinds.end() && it->second == DEFINITION_IMPLICIT)
{
continue;
}
TooltipSnippet snippet;
NameHierarchy nameHierarchy = NameHierarchy::deserialize(node.serializedName);