logic: make SearchController only listen to MessageActivateTokens

This change makes MessageActivateTokens being used consistently throughout all Controllers. The FeatureController
accepts all incoming activation messages and turns them into MessageActivateTokens, which are then accepted by all
view controllers.

src/lib/data/Storage.cpp

@@ -784,6 +784,42 @@ std::vector<SearchMatch> Storage::getAutocompletionMatches(const std::string& qu
 	return matches;
 }
 
+std::vector<SearchMatch> Storage::getSearchMatchesForTokenIds(const std::vector<Id>& tokenIds) const
+{
+	std::vector<SearchMatch> matches;
+
+	for (Id tokenId : tokenIds)
+	{
+		SearchMatch match;
+
+		if (m_sqliteStorage.isFile(tokenId))
+		{
+			StorageFile file = m_sqliteStorage.getFileById(tokenId);
+
+			match.fullName = m_tokenIndex.getNameHierarchyForTokenId(tokenId).getFullName();
+			match.nodeType = Node::NODE_FILE;
+		}
+		else if (m_sqliteStorage.isNode(tokenId))
+		{
+			StorageNode node = m_sqliteStorage.getNodeById(tokenId);
+
+			match.fullName = m_tokenIndex.getNameHierarchyForTokenId(tokenId).getFullName();
+			match.nodeType = Node::intToType(node.type);
+		}
+		else
+		{
+			continue;
+		}
+
+		match.tokenIds.insert(tokenId);
+		match.searchType = SearchMatch::SEARCH_TOKEN;
+
+		matches.push_back(match);
+	}
+
+	return matches;
+}
+
 std::shared_ptr<Graph> Storage::getGraphForActiveTokenIds(const std::vector<Id>& tokenIds) const
 {
 	std::shared_ptr<Graph> g = std::make_shared<Graph>();

src/lib/data/Storage.h

@@ -130,8 +130,10 @@ public:
 
 	virtual NameHierarchy getNameHierarchyForNodeWithId(Id nodeId) const;
 	virtual Node::NodeType getNodeTypeForNodeWithId(Id nodeId) const;
+
 	virtual std::vector<SearchMatch> getAutocompletionMatches(
 		const std::string& query, const std::string& word) const;
+	virtual std::vector<SearchMatch> getSearchMatchesForTokenIds(const std::vector<Id>& tokenIds) const;
 
 	virtual std::shared_ptr<Graph> getGraphForActiveTokenIds(const std::vector<Id>& tokenIds) const;
 
@@ -156,6 +158,8 @@ public:
 
 	virtual std::shared_ptr<TextAccess> getFileContent(const FilePath& filePath) const;
 
+
+
 private:
 	Id addNodeHierarchy(Node::NodeType nodeType, NameHierarchy nameHierarchy, bool distinct = false);
 	Id addNodeHierarchyWithDistinctSignature(Node::NodeType type, const ParseFunction& function);

src/lib/data/access/StorageAccess.h

@@ -31,8 +31,10 @@ public:
 
 	virtual NameHierarchy getNameHierarchyForNodeWithId(Id id) const = 0;
 	virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const = 0;
+
 	virtual std::vector<SearchMatch> getAutocompletionMatches(
 		const std::string& query, const std::string& word) const = 0;
+	virtual std::vector<SearchMatch> getSearchMatchesForTokenIds(const std::vector<Id>& tokenIds) const = 0;
 
 	virtual std::shared_ptr<Graph> getGraphForActiveTokenIds(const std::vector<Id>& tokenIds) const = 0;
 

src/lib/data/access/StorageAccessProxy.cpp

@@ -94,6 +94,16 @@ std::vector<SearchMatch> StorageAccessProxy::getAutocompletionMatches(
 	return std::vector<SearchMatch>();
 }
 
+std::vector<SearchMatch> StorageAccessProxy::getSearchMatchesForTokenIds(const std::vector<Id>& tokenIds) const
+{
+	if (hasSubject())
+	{
+		return m_subject->getSearchMatchesForTokenIds(tokenIds);
+	}
+
+	return std::vector<SearchMatch>();
+}
+
 std::shared_ptr<Graph> StorageAccessProxy::getGraphForActiveTokenIds(const std::vector<Id>& tokenIds) const
 {
 	if (hasSubject())

src/lib/data/access/StorageAccessProxy.h

@@ -21,8 +21,9 @@ public:
 
 	virtual NameHierarchy getNameHierarchyForNodeWithId(Id id) const;
 	virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const;
-	virtual std::vector<SearchMatch> getAutocompletionMatches(
-		const std::string& query, const std::string& word) const;
+
+	virtual std::vector<SearchMatch> getAutocompletionMatches(const std::string& query, const std::string& word) const;
+	virtual std::vector<SearchMatch> getSearchMatchesForTokenIds(const std::vector<Id>& tokenIds) const;
 
 	virtual std::shared_ptr<Graph> getGraphForActiveTokenIds(const std::vector<Id>& tokenIds) const;