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

logic: Added namespaces to overview and fixed namespace activation

Browse Source
This commit is contained in:
Eberhard Graether
2016-02-08 03:39:08 +01:00
parent d6c03ffb02
commit 29149f313a
24 changed files with 147 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/CodeController.cpp
+17 -9
View File
@@ -88,18 +88,26 @@ void CodeController::handleMessage(MessageActivateAll* message)
void CodeController::handleMessage(MessageActivateTokens* message)
{
std::vector<Id> activeTokenIds = message->tokenIds;
Id declarationId = 0; // 0 means that no token is found.
if (activeTokenIds.size() == 1)
{
activeTokenIds = m_storageAccess->getActiveTokenIdsForId(activeTokenIds[0], &declarationId);
}
// TODO: what about declarationId if more than 1 token is active? FIX THIS!
CodeView* view = getView();
view->setErrorMessages(std::vector<std::string>());
std::vector<Id> activeTokenIds =
(message->originalTokenIds.size() > 0 ? message->originalTokenIds : message->tokenIds);
if (activeTokenIds.size() != 1)
{
view->clear();
return;
}
Id declarationId = 0; // 0 means that no token is found.
activeTokenIds = m_storageAccess->getActiveTokenIdsForId(activeTokenIds[0], &declarationId);
if (message->originalTokenIds.size() > 0)
{
declarationId = 0;
}
if (message->isEdge)
{
view->showFirstActiveSnippet(activeTokenIds, message->isLast());