ui: Added shortcuts for navigating to next and previous reference in code view

* Added new class QtCodeNavigator between QtCodeView and QtCodeFileList that handles active ids and navigation
* Pass all files as initially collapsed to code view and decide in QtCodeNavigator which ones show content
* Rewrote requesting of active snippet display to top down approach
* Display other locations focused when active location changes
* Show corresponding edges when navigating references

src/lib/component/controller/CodeController.cpp

@@ -122,7 +122,8 @@ void CodeController::handleMessage(MessageActivateTokens* message)
 
 	if (message->isEdge)
 	{
-		view->showFirstActiveSnippet(activeTokenIds, message->isLast());
+		std::shared_ptr<TokenLocationCollection> collection = m_storageAccess->getTokenLocationsForTokenIds(activeTokenIds);
+		view->showActiveSnippet(activeTokenIds, collection, message->isLast());
 	}
 	else if (message->keepContent())
 	{
@@ -365,9 +366,6 @@ std::vector<CodeSnippetParams> CodeController::getSnippetsForActiveTokenLocation
 	TRACE();
 
 	std::vector<CodeSnippetParams> snippets;
-	size_t definitionFileCount = 0;
-	size_t declarationFileCount = 0;
-
 	collection->forEachTokenLocationFile(
 		[&](std::shared_ptr<TokenLocationFile> file) -> void
 		{
@@ -388,38 +386,15 @@ std::vector<CodeSnippetParams> CodeController::getSnippetsForActiveTokenLocation
 				}
 			);
 
-			if (collection->getTokenLocationFileCount() < 5 || file->isWholeCopy ||
-				(isDefinitionFile && definitionFileCount < 3) ||
-				(!isDefinitionFile && isDeclarationFile && declarationFileCount < 3))
-			{
-				std::vector<CodeSnippetParams> fileSnippets = getSnippetsForFile(file, true);
+			CodeSnippetParams params;
+			params.locationFile = file;
+			params.refCount = file->getUnscopedStartTokenLocationCount();
 
-				for (CodeSnippetParams& snippet : fileSnippets)
-				{
-					snippet.isDeclaration = isDeclarationFile;
-					snippet.isDefinition = isDefinitionFile;
-				}
+			params.isDeclaration = isDeclarationFile;
+			params.isDefinition = isDefinitionFile;
 
-				utility::append(snippets, fileSnippets);
-			}
-			else
-			{
-				CodeSnippetParams params;
-				params.locationFile = file;
-				params.refCount = file->getUnscopedStartTokenLocationCount();
-
-				params.isCollapsed = true;
-				snippets.push_back(params);
-			}
-
-			if (isDefinitionFile)
-			{
-				definitionFileCount++;
-			}
-			else if (isDeclarationFile)
-			{
-				declarationFileCount++;
-			}
+			params.isCollapsed = true;
+			snippets.push_back(params);
 		}
 	);
 
@@ -439,20 +414,12 @@ std::vector<CodeSnippetParams> CodeController::getSnippetsForCollection(
 	collection->forEachTokenLocationFile(
 		[&](std::shared_ptr<TokenLocationFile> file) -> void
 		{
-			if (snippets.size() < 10)
-			{
-				std::vector<CodeSnippetParams> fileSnippets = getSnippetsForFile(file, addTokenLocations);
-				snippets.insert(snippets.end(), fileSnippets.begin(), fileSnippets.end());
-			}
-			else
-			{
-				CodeSnippetParams params;
-				params.locationFile = file;
-				params.refCount = file->getUnscopedStartTokenLocationCount();
+			CodeSnippetParams params;
+			params.locationFile = file;
+			params.refCount = file->getUnscopedStartTokenLocationCount();
 
-				params.isCollapsed = true;
-				snippets.push_back(params);
-			}
+			params.isCollapsed = true;
+			snippets.push_back(params);
 		}
 	);
 

src/lib/component/controller/GraphController.cpp

@@ -176,6 +176,18 @@ void GraphController::handleMessage(MessageShowErrors* message)
 	clear();
 }
 
+void GraphController::handleMessage(MessageShowReference* message)
+{
+	if (!message->tokenId)
+	{
+		return;
+	}
+
+	m_activeEdgeIds = std::vector<Id>(1, message->tokenId);
+	setActiveAndVisibility(utility::concat(m_activeNodeIds, m_activeEdgeIds));
+	buildGraph(message, false);
+}
+
 GraphView* GraphController::getView() const
 {
 	return Controller::getView<GraphView>();

src/lib/component/controller/GraphController.h

@@ -16,6 +16,7 @@
 #include "utility/messaging/type/MessageGraphNodeMove.h"
 #include "utility/messaging/type/MessageSearchFullText.h"
 #include "utility/messaging/type/MessageShowErrors.h"
+#include "utility/messaging/type/MessageShowReference.h"
 
 #include "component/controller/Controller.h"
 #include "component/controller/helper/DummyEdge.h"
@@ -41,6 +42,7 @@ class GraphController
 	, public MessageListener<MessageGraphNodeMove>
 	, public MessageListener<MessageSearchFullText>
 	, public MessageListener<MessageShowErrors>
+	, public MessageListener<MessageShowReference>
 {
 public:
 	GraphController(StorageAccess* storageAccess);
@@ -57,6 +59,7 @@ private:
 	virtual void handleMessage(MessageGraphNodeMove* message);
 	virtual void handleMessage(MessageSearchFullText* message);
 	virtual void handleMessage(MessageShowErrors* message);
+	virtual void handleMessage(MessageShowReference* message);
 
 	GraphView* getView() const;
 

src/lib/component/view/CodeView.h

@@ -10,6 +10,7 @@
 #include "component/view/View.h"
 
 class CodeController;
+class TokenLocationCollection;
 
 class CodeView
 	: public View
@@ -29,7 +30,6 @@ public:
 
 	virtual void clear() = 0;
 
-	virtual void setActiveTokenIds(const std::vector<Id>& activeTokenIds) = 0;
 	virtual void setErrorInfos(const std::vector<ErrorInfo>& errorInfos) = 0;
 
 	virtual void showCodeSnippets(const std::vector<CodeSnippetParams>& snippets, const std::vector<Id>& activeTokenIds) = 0;
@@ -38,7 +38,8 @@ public:
 
 	virtual void setFileState(const FilePath filePath, FileState state) = 0;
 
-	virtual void showFirstActiveSnippet(const std::vector<Id>& activeTokenIds, bool scrollTo) = 0;
+	virtual void showActiveSnippet(
+		const std::vector<Id>& activeTokenIds, std::shared_ptr<TokenLocationCollection> collection, bool scrollTo) = 0;
 	virtual void showActiveTokenIds(const std::vector<Id>& activeTokenIds) = 0;
 	virtual void showActiveLocalSymbolIds(const std::vector<Id>& activeLocalSymbolIds) = 0;
 

src/lib/component/view/helper/CodeSnippetParams.cpp

@@ -9,7 +9,6 @@ CodeSnippetParams::CodeSnippetParams()
 	, footerId(0)
 	, locationFile()
 	, refCount(0)
-	, isActive(false)
 	, isCollapsed(false)
 	, isDeclaration(false)
 	, isDefinition(false)
@@ -19,16 +18,6 @@ CodeSnippetParams::CodeSnippetParams()
 
 bool CodeSnippetParams::sort(const CodeSnippetParams& a, const CodeSnippetParams& b)
 {
-	// sort active snippet first
-	if (a.isActive && !b.isActive)
-	{
-		return true;
-	}
-	else if (!a.isActive && b.isActive)
-	{
-		return false;
-	}
-
 	// sort definitions
 	if (a.isDefinition && !b.isDefinition)
 	{

src/lib/component/view/helper/CodeSnippetParams.h

@@ -30,7 +30,6 @@ struct CodeSnippetParams
 
 	int refCount;
 
-	bool isActive;
 	bool isCollapsed;
 
 	bool isDeclaration;