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

logic: Refactored undo redo stack

Browse Source 
* Store MessageActivateTokens instead of original view messages
* Renamed FeatureController to ActivationController
* Remove all non-activation messages from undo redo stack after reindexing project
* Added MessageShowReference to undo redo stack
* Added MessageScrollGraph for restoring graph view scroll position
* Fixed MessageGraphNodeMove not saved for bundles
* Refactored tokenIds and nodeNames in SearchMatch and MessageActivateTokens
* Refactored SearchController
* Fixed file expansion on undoing/redoing after switching code view mode
* Fixed redundant graph animation due to present qualifier nodes
* Fixed no restoring of graph node expansion when showing overview in between
This commit is contained in:
Eberhard Graether
2017-03-16 23:24:33 +01:00
parent aa49fffca6
commit 630009a2ba
44 changed files with 516 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/CodeController.cpp
+25 -11
View File
@@ -105,17 +105,18 @@ void CodeController::handleMessage(MessageActivateTokens* message)
CodeView* view = getView();
if (!message->keepContent())
{
view->clearCodeSnippets();
}
std::vector<Id> activeTokenIds = message->tokenIds;
if (!activeTokenIds.size())
{
view->clear();
return;
}
if (!message->keepContent())
{
view->clearCodeSnippets();
}
Id declarationId = 0; // 0 means that no token is found.
if (!message->isAggregation)
{
@@ -139,17 +140,21 @@ void CodeController::handleMessage(MessageActivateTokens* message)
else
{
m_collection = m_storageAccess->getTokenLocationsForTokenIds(activeTokenIds);
view->showCodeSnippets(getSnippetsForActiveTokenLocations(m_collection.get(), declarationId), activeTokenIds, true);
m_scrollToDefinition = !message->isReplayed() || message->isLast();
view->showCodeSnippets(
getSnippetsForActiveTokenLocations(m_collection.get(), declarationId),
activeTokenIds,
!message->isReplayed() || message->isReplayCleared()
);
m_scrollToDefinition = !message->isReplayed() || message->isReplayCleared();
size_t fileCount = m_collection->getTokenLocationFileCount();
size_t referenceCount = m_collection->getTokenLocationCount();
std::stringstream ss;
if (message->unknownNames.size())
if (message->tokenNames.size())
{
ss << "Activate \"" << message->unknownNames[0] << "\": ";
ss << "Activate \"" << message->tokenNames[0].getQualifiedName() << "\": ";
}
ss << message->tokenIds.size() << ' ';
@@ -179,15 +184,22 @@ void CodeController::handleMessage(MessageChangeFileView* message)
}
CodeView* view = getView();
bool inListMode = view->isInListMode();
switch (message->state)
MessageChangeFileView::FileState state = message->state;
if (state == MessageChangeFileView::FILE_DEFAULT_FOR_MODE)
{
state = inListMode ? MessageChangeFileView::FILE_SNIPPETS : MessageChangeFileView::FILE_MAXIMIZED;
}
switch (state)
{
case MessageChangeFileView::FILE_MINIMIZED:
view->setFileState(message->filePath, CodeView::FILE_MINIMIZED);
break;
case MessageChangeFileView::FILE_SNIPPETS:
if (message->needsData)
if (message->needsData && inListMode)
{
std::shared_ptr<TokenLocationFile> file = m_collection->getTokenLocationFileByPath(message->filePath);
if (!file)
@@ -250,6 +262,8 @@ void CodeController::handleMessage(MessageChangeFileView* message)
view->setFileState(message->filePath, CodeView::FILE_MAXIMIZED);
break;
default:
break;
}
showContents(message);