diff --git a/src/lib/component/controller/ActivationController.cpp b/src/lib/component/controller/ActivationController.cpp index eae27cb6..a2240d38 100644 --- a/src/lib/component/controller/ActivationController.cpp +++ b/src/lib/component/controller/ActivationController.cpp @@ -49,7 +49,7 @@ void ActivationController::handleMessage(MessageActivateEdge* message) void ActivationController::handleMessage(MessageActivateFile* message) { - Id fileId = m_storageAccess->getTokenIdForFileNode(message->filePath); + Id fileId = m_storageAccess->getNodeIdForFileNode(message->filePath); if (fileId) { @@ -80,7 +80,7 @@ void ActivationController::handleMessage(MessageActivateNodes* message) MessageActivateTokens m(message); for (const MessageActivateNodes::ActiveNode& node : message->nodes) { - Id nodeId = node.nodeId ? node.nodeId : m_storageAccess->getIdForNodeWithNameHierarchy(node.nameHierarchy); + Id nodeId = node.nodeId ? node.nodeId : m_storageAccess->getNodeIdForNameHierarchy(node.nameHierarchy); if (nodeId > 0) { m.tokenIds.push_back(nodeId); @@ -146,7 +146,7 @@ void ActivationController::handleMessage(MessageActivateTokenLocations* message) MessageActivateNodes m; for (Id nodeId : m_storageAccess->getNodeIdsForLocationIds(message->locationIds)) { - m.addNode(nodeId, m_storageAccess->getNameHierarchyForNodeWithId(nodeId)); + m.addNode(nodeId, m_storageAccess->getNameHierarchyForNodeId(nodeId)); } m.dispatchImmediately(); } diff --git a/src/lib/component/controller/BookmarkController.cpp b/src/lib/component/controller/BookmarkController.cpp index 1fe750e2..e28daba5 100644 --- a/src/lib/component/controller/BookmarkController.cpp +++ b/src/lib/component/controller/BookmarkController.cpp @@ -235,8 +235,8 @@ void BookmarkController::handleMessage(MessageActivateTokens* message) tokenTypes.push_back(typeId); - NameHierarchy sourceHierarchy = m_storageAccess->getNameHierarchyForNodeWithId(edge.sourceNodeId); - NameHierarchy targetHierarchy = m_storageAccess->getNameHierarchyForNodeWithId(edge.targetNodeId); + NameHierarchy sourceHierarchy = m_storageAccess->getNameHierarchyForNodeId(edge.sourceNodeId); + NameHierarchy targetHierarchy = m_storageAccess->getNameHierarchyForNodeId(edge.targetNodeId); std::string sourceNode = NameHierarchy::serialize(sourceHierarchy); std::string targetNode = NameHierarchy::serialize(targetHierarchy); @@ -498,7 +498,7 @@ std::vector BookmarkController::getTokenNames(const std::vector for (unsigned int i = 0; i < ids.size(); i++) { - NameHierarchy nameHierarchy = m_storageAccess->getNameHierarchyForNodeWithId(ids[i]); + NameHierarchy nameHierarchy = m_storageAccess->getNameHierarchyForNodeId(ids[i]); names.push_back(NameHierarchy::serialize(nameHierarchy)); } @@ -511,7 +511,7 @@ std::vector BookmarkController::getTokenDisplayNames(const std::vec for (unsigned int i = 0; i < ids.size(); i++) { - NameHierarchy nameHierarchy = m_storageAccess->getNameHierarchyForNodeWithId(ids[i]); + NameHierarchy nameHierarchy = m_storageAccess->getNameHierarchyForNodeId(ids[i]); names.push_back(nameHierarchy.getRawName()); } @@ -533,7 +533,7 @@ std::vector BookmarkController::getTokenTypes(const std::vector& ids) c std::string BookmarkController::getDisplayName(Id id) const { - NameHierarchy nameHierarchy = m_storageAccess->getNameHierarchyForNodeWithId(id); + NameHierarchy nameHierarchy = m_storageAccess->getNameHierarchyForNodeId(id); return nameHierarchy.getRawName(); } diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp index abc2f83e..815c3fb7 100644 --- a/src/lib/component/controller/CodeController.cpp +++ b/src/lib/component/controller/CodeController.cpp @@ -614,7 +614,7 @@ std::vector CodeController::getSnippetsForFile( )->forEachStartTokenLocation( // this TokenLocationFile only contains a single StartTokenLocation. [&](TokenLocation* location) { - params.title = m_storageAccess->getNameHierarchyForNodeWithId(location->getTokenId()).getQualifiedName(); + params.title = m_storageAccess->getNameHierarchyForNodeId(location->getTokenId()).getQualifiedName(); params.titleId = location->getId(); } ); @@ -640,7 +640,7 @@ std::vector CodeController::getSnippetsForFile( )->forEachStartTokenLocation( // this TokenLocationFile only contains a single StartTokenLocation. [&](TokenLocation* location) { - params.footer = m_storageAccess->getNameHierarchyForNodeWithId(location->getTokenId()).getQualifiedName(); + params.footer = m_storageAccess->getNameHierarchyForNodeId(location->getTokenId()).getQualifiedName(); params.footerId = location->getId(); } ); @@ -791,7 +791,7 @@ std::vector CodeController::getProjectDescription(TokenLocationFile std::string serializedName = line.substr(posA + 1, posB - posA - 1); NameHierarchy nameHierarchy = NameHierarchy::deserialize(serializedName); - Id tokenId = m_storageAccess->getIdForNodeWithNameHierarchy(nameHierarchy); + Id tokenId = m_storageAccess->getNodeIdForNameHierarchy(nameHierarchy); std::string nameString = nameHierarchy.getQualifiedName(); if (tokenId > 0) diff --git a/src/lib/component/controller/IDECommunicationController.cpp b/src/lib/component/controller/IDECommunicationController.cpp index 4a38c688..7fa4636c 100644 --- a/src/lib/component/controller/IDECommunicationController.cpp +++ b/src/lib/component/controller/IDECommunicationController.cpp @@ -116,7 +116,7 @@ void IDECommunicationController::handleSetActiveTokenMessage( } } - Id fileId = m_storageAccess->getTokenIdForFileNode(message.fileLocation); + Id fileId = m_storageAccess->getNodeIdForFileNode(message.fileLocation); if (fileId > 0) { MessageActivateFile(message.fileLocation, message.row).dispatchImmediately(); diff --git a/src/lib/data/PersistentStorage.cpp b/src/lib/data/PersistentStorage.cpp index 43dcf955..75364a44 100644 --- a/src/lib/data/PersistentStorage.cpp +++ b/src/lib/data/PersistentStorage.cpp @@ -460,37 +460,37 @@ void PersistentStorage::optimizeMemory() m_sqliteStorage.setVersion(); } -Id PersistentStorage::getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const +Id PersistentStorage::getNodeIdForFileNode(const FilePath& filePath) const +{ + return m_sqliteStorage.getFileByPath(filePath.str()).id; +} + +Id PersistentStorage::getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const { return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id; } -Id PersistentStorage::getIdForEdge( - Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy -) const +std::vector PersistentStorage::getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const { - Id sourceId = getIdForNodeWithNameHierarchy(fromNameHierarchy); - Id targetId = getIdForNodeWithNameHierarchy(toNameHierarchy); - return m_sqliteStorage.getEdgeBySourceTargetType(sourceId, targetId, type).id; + std::vector nodeIds; + for (const NameHierarchy& name : nameHierarchies) + { + Id nodeId = getNodeIdForNameHierarchy(name); + if (nodeId) + { + nodeIds.push_back(nodeId); + } + } + return nodeIds; } -StorageEdge PersistentStorage::getEdgeById(Id edgeId) const -{ - return m_sqliteStorage.getEdgeById(edgeId); -} - -NameHierarchy PersistentStorage::getNameHierarchyForNodeWithId(Id nodeId) const +NameHierarchy PersistentStorage::getNameHierarchyForNodeId(Id nodeId) const { TRACE(); return NameHierarchy::deserialize(m_sqliteStorage.getFirstById(nodeId).serializedName); } -Node::NodeType PersistentStorage::getNodeTypeForNodeWithId(Id nodeId) const -{ - return Node::intToType(m_sqliteStorage.getFirstById(nodeId).type); -} - std::vector PersistentStorage::getNameHierarchiesForNodeIds(const std::vector nodeIds) const { std::vector nameHierarchies; @@ -501,18 +501,33 @@ std::vector PersistentStorage::getNameHierarchiesForNodeIds(const return nameHierarchies; } -std::vector PersistentStorage::getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const +Node::NodeType PersistentStorage::getNodeTypeForNodeWithId(Id nodeId) const { - std::vector nodeIds; - for (const NameHierarchy& name : nameHierarchies) - { - Id nodeId = getIdForNodeWithNameHierarchy(name); - if (nodeId) - { - nodeIds.push_back(nodeId); - } - } - return nodeIds; + return Node::intToType(m_sqliteStorage.getFirstById(nodeId).type); +} + +bool PersistentStorage::checkNodeExistsByName(const std::string& serializedName) const +{ + return m_sqliteStorage.checkNodeExistsByName(serializedName); +} + +Id PersistentStorage::getIdForEdge( + Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy +) const +{ + Id sourceId = getNodeIdForNameHierarchy(fromNameHierarchy); + Id targetId = getNodeIdForNameHierarchy(toNameHierarchy); + return m_sqliteStorage.getEdgeBySourceTargetType(sourceId, targetId, type).id; +} + +StorageEdge PersistentStorage::getEdgeById(Id edgeId) const +{ + return m_sqliteStorage.getEdgeById(edgeId); +} + +bool PersistentStorage::checkEdgeExists(Id edgeId) const +{ + return m_sqliteStorage.checkEdgeExists(edgeId); } std::shared_ptr PersistentStorage::getFullTextSearchLocations( @@ -1019,11 +1034,6 @@ std::vector PersistentStorage::getActiveTokenIdsForId(Id tokenId, Id* declar return activeTokenIds; } -bool PersistentStorage::checkEdgeExists(Id edgeId) const -{ - return m_sqliteStorage.checkEdgeExists(edgeId); -} - std::vector PersistentStorage::getNodeIdsForLocationIds(const std::vector& locationIds) const { TRACE(); @@ -1075,33 +1085,6 @@ std::vector PersistentStorage::getNodeIdsForLocationIds(const std::vector PersistentStorage::getLocalSymbolIdsForLocationIds(const std::vector& locationIds) const -{ - std::set localSymbolIds; - - for (const StorageOccurrence& occurrence: m_sqliteStorage.getOccurrencesForLocationIds(locationIds)) - { - Id elementId = occurrence.elementId; - - if (m_sqliteStorage.getFirstById(elementId).id == 0 && m_sqliteStorage.getFirstById(elementId).id == 0) - { - localSymbolIds.insert(elementId); - } - } - - return utility::toVector(localSymbolIds); -} - -bool PersistentStorage::checkNodeExistsByName(const std::string& serializedName) const -{ - return m_sqliteStorage.checkNodeExistsByName(serializedName); -} - -Id PersistentStorage::getTokenIdForFileNode(const FilePath& filePath) const -{ - return m_sqliteStorage.getFileByPath(filePath.str()).id; -} - std::shared_ptr PersistentStorage::getTokenLocationsForTokenIds( const std::vector& tokenIds) const { diff --git a/src/lib/data/PersistentStorage.h b/src/lib/data/PersistentStorage.h index 6572d651..0bac34ac 100644 --- a/src/lib/data/PersistentStorage.h +++ b/src/lib/data/PersistentStorage.h @@ -96,16 +96,20 @@ public: void optimizeMemory(); // StorageAccess implementation - virtual Id getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const; + virtual Id getNodeIdForFileNode(const FilePath& filePath) const; + virtual Id getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const; + virtual std::vector getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const; + + virtual NameHierarchy getNameHierarchyForNodeId(Id nodeId) const; + virtual std::vector getNameHierarchiesForNodeIds(const std::vector nodeIds) const; + + virtual Node::NodeType getNodeTypeForNodeWithId(Id nodeId) const; + virtual bool checkNodeExistsByName(const std::string& serializedName) const; + virtual Id getIdForEdge( Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const; virtual StorageEdge getEdgeById(Id edgeId) const; - - virtual NameHierarchy getNameHierarchyForNodeWithId(Id nodeId) const; - virtual Node::NodeType getNodeTypeForNodeWithId(Id nodeId) const; - - virtual std::vector getNameHierarchiesForNodeIds(const std::vector nodeIds) const; - virtual std::vector getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const; + virtual bool checkEdgeExists(Id edgeId) const; virtual std::shared_ptr getFullTextSearchLocations( const std::string& searchTerm, bool caseSensitive) const; @@ -119,14 +123,7 @@ public: virtual std::shared_ptr getGraphForActiveTokenIds(const std::vector& tokenIds, bool* isActiveNamespace = nullptr) const; virtual std::vector getActiveTokenIdsForId(Id tokenId, Id* declarationId) const; - - virtual bool checkEdgeExists(Id edgeId) const; - virtual std::vector getNodeIdsForLocationIds(const std::vector& locationIds) const; - virtual std::vector getLocalSymbolIdsForLocationIds(const std::vector& locationIds) const; - virtual bool checkNodeExistsByName(const std::string& serializedName) const; - - virtual Id getTokenIdForFileNode(const FilePath& filePath) const; virtual std::shared_ptr getTokenLocationsForTokenIds( const std::vector& tokenIds @@ -176,9 +173,7 @@ private: void addNodesToGraph(const std::vector& nodeIds, Graph* graph) const; void addEdgesToGraph(const std::vector& edgeIds, Graph* graph) const; void addNodesWithChildrenAndEdgesToGraph( - const std::vector& nodeIds, - const std::vector& edgeIds, Graph* graph - ) const; + const std::vector& nodeIds, const std::vector& edgeIds, Graph* graph) const; void addAggregationEdgesToGraph(const Id nodeId, const std::vector& edgesToAggregate, Graph* graph) const; void addComponentAccessToGraph(Graph* graph) const; diff --git a/src/lib/data/access/StorageAccess.h b/src/lib/data/access/StorageAccess.h index f47bf5ab..1d736f85 100644 --- a/src/lib/data/access/StorageAccess.h +++ b/src/lib/data/access/StorageAccess.h @@ -13,7 +13,6 @@ #include "data/bookmark/BookmarkCategory.h" #include "data/bookmark/EdgeBookmark.h" #include "data/bookmark/NodeBookmark.h" -#include "data/parser/ParseLocation.h" #include "data/graph/Node.h" #include "data/search/SearchMatch.h" #include "data/ErrorCountInfo.h" @@ -26,26 +25,26 @@ class TextAccess; class TokenLocation; class TokenLocationCollection; class TokenLocationFile; -class TimePoint; class StorageAccess { public: virtual ~StorageAccess(); - virtual Id getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const = 0; - virtual Id getIdForEdge( - Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const = 0; - virtual StorageEdge getEdgeById(Id edgeId) const = 0; + virtual Id getNodeIdForFileNode(const FilePath& filePath) const = 0; + virtual Id getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const = 0; + virtual std::vector getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const = 0; - virtual bool checkEdgeExists(Id edgeId) const = 0; + virtual NameHierarchy getNameHierarchyForNodeId(Id id) const = 0; + virtual std::vector getNameHierarchiesForNodeIds(const std::vector nodeIds) const = 0; - virtual NameHierarchy getNameHierarchyForNodeWithId(Id id) const = 0; virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const = 0; virtual bool checkNodeExistsByName(const std::string& serializedName) const = 0; - virtual std::vector getNameHierarchiesForNodeIds(const std::vector nodeIds) const = 0; - virtual std::vector getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const = 0; + virtual Id getIdForEdge( + Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const = 0; + virtual StorageEdge getEdgeById(Id edgeId) const = 0; + virtual bool checkEdgeExists(Id edgeId) const = 0; virtual std::shared_ptr getFullTextSearchLocations( const std::string& searchTerm, bool caseSensitive) const = 0; @@ -56,11 +55,7 @@ public: virtual std::shared_ptr getGraphForActiveTokenIds(const std::vector& tokenIds, bool* isActiveNamespace = nullptr) const = 0; virtual std::vector getActiveTokenIdsForId(Id tokenId, Id* declarationId) const = 0; - virtual std::vector getNodeIdsForLocationIds(const std::vector& locationIds) const = 0; - virtual std::vector getLocalSymbolIdsForLocationIds(const std::vector& locationIds) const = 0; - - virtual Id getTokenIdForFileNode(const FilePath& filePath) const = 0; virtual std::shared_ptr getTokenLocationsForTokenIds( const std::vector& tokenIds) const = 0; diff --git a/src/lib/data/access/StorageAccessProxy.cpp b/src/lib/data/access/StorageAccessProxy.cpp index 11fb54af..76586488 100644 --- a/src/lib/data/access/StorageAccessProxy.cpp +++ b/src/lib/data/access/StorageAccessProxy.cpp @@ -36,16 +36,72 @@ void StorageAccessProxy::setSubject(StorageAccess* subject) setErrorFilter(m_errorFilter); } -Id StorageAccessProxy::getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const +Id StorageAccessProxy::getNodeIdForFileNode(const FilePath& filePath) const { if (hasSubject()) { - return m_subject->getIdForNodeWithNameHierarchy(nameHierarchy); + return m_subject->getNodeIdForFileNode(filePath); } return 0; } +Id StorageAccessProxy::getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const +{ + if (hasSubject()) + { + return m_subject->getNodeIdForNameHierarchy(nameHierarchy); + } + + return 0; +} + +std::vector StorageAccessProxy::getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const +{ + if (hasSubject()) + { + return m_subject->getNodeIdsForNameHierarchies(nameHierarchies); + } + return std::vector(); +} + +NameHierarchy StorageAccessProxy::getNameHierarchyForNodeId(Id id) const +{ + if (hasSubject()) + { + return m_subject->getNameHierarchyForNodeId(id); + } + + return NameHierarchy(); +} + +std::vector StorageAccessProxy::getNameHierarchiesForNodeIds(const std::vector nodeIds) const +{ + if (hasSubject()) + { + return m_subject->getNameHierarchiesForNodeIds(nodeIds); + } + return std::vector(); +} + +Node::NodeType StorageAccessProxy::getNodeTypeForNodeWithId(Id id) const +{ + if (hasSubject()) + { + return m_subject->getNodeTypeForNodeWithId(id); + } + return Node::NODE_NON_INDEXED; +} + +bool StorageAccessProxy::checkNodeExistsByName(const std::string& serializedName) const +{ + if (hasSubject()) + { + return m_subject->checkNodeExistsByName(serializedName); + } + return false; +} + Id StorageAccessProxy::getIdForEdge( Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy ) const { @@ -77,52 +133,6 @@ bool StorageAccessProxy::checkEdgeExists(Id edgeId) const return false; } -NameHierarchy StorageAccessProxy::getNameHierarchyForNodeWithId(Id id) const -{ - if (hasSubject()) - { - return m_subject->getNameHierarchyForNodeWithId(id); - } - - return NameHierarchy(); -} - -Node::NodeType StorageAccessProxy::getNodeTypeForNodeWithId(Id id) const -{ - if (hasSubject()) - { - return m_subject->getNodeTypeForNodeWithId(id); - } - return Node::NODE_NON_INDEXED; -} - -bool StorageAccessProxy::checkNodeExistsByName(const std::string& serializedName) const -{ - if (hasSubject()) - { - return m_subject->checkNodeExistsByName(serializedName); - } - return false; -} - -std::vector StorageAccessProxy::getNameHierarchiesForNodeIds(const std::vector nodeIds) const -{ - if (hasSubject()) - { - return m_subject->getNameHierarchiesForNodeIds(nodeIds); - } - return std::vector(); -} - -std::vector StorageAccessProxy::getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const -{ - if (hasSubject()) - { - return m_subject->getNodeIdsForNameHierarchies(nameHierarchies); - } - return std::vector(); -} - std::shared_ptr StorageAccessProxy::getFullTextSearchLocations( const std::string &searchTerm, bool caseSensitive) const { @@ -194,26 +204,6 @@ std::vector StorageAccessProxy::getNodeIdsForLocationIds(const std::vector(); } -std::vector StorageAccessProxy::getLocalSymbolIdsForLocationIds(const std::vector& locationIds) const -{ - if (hasSubject()) - { - return m_subject->getLocalSymbolIdsForLocationIds(locationIds); - } - - return std::vector(); -} - -Id StorageAccessProxy::getTokenIdForFileNode(const FilePath& filePath) const -{ - if (hasSubject()) - { - return m_subject->getTokenIdForFileNode(filePath); - } - - return 0; -} - std::shared_ptr StorageAccessProxy::getTokenLocationsForTokenIds( const std::vector& tokenIds) const { diff --git a/src/lib/data/access/StorageAccessProxy.h b/src/lib/data/access/StorageAccessProxy.h index 30fa38ce..b04ce7c1 100644 --- a/src/lib/data/access/StorageAccessProxy.h +++ b/src/lib/data/access/StorageAccessProxy.h @@ -18,19 +18,20 @@ public: void setSubject(StorageAccess* subject); // StorageAccess implementation - virtual Id getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const; - virtual Id getIdForEdge( - Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const; - virtual StorageEdge getEdgeById(Id edgeId) const; + virtual Id getNodeIdForFileNode(const FilePath& filePath) const; + virtual Id getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const; + virtual std::vector getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const; - virtual bool checkEdgeExists(Id edgeId) const; + virtual NameHierarchy getNameHierarchyForNodeId(Id id) const; + virtual std::vector getNameHierarchiesForNodeIds(const std::vector nodeIds) const; - virtual NameHierarchy getNameHierarchyForNodeWithId(Id id) const; virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const; virtual bool checkNodeExistsByName(const std::string& serializedName) const; - virtual std::vector getNameHierarchiesForNodeIds(const std::vector nodeIds) const; - virtual std::vector getNodeIdsForNameHierarchies(const std::vector nameHierarchies) const; + virtual Id getIdForEdge( + Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const; + virtual StorageEdge getEdgeById(Id edgeId) const; + virtual bool checkEdgeExists(Id edgeId) const; virtual std::shared_ptr getFullTextSearchLocations( const std::string& searchTerm, bool caseSensitive) const; @@ -41,11 +42,7 @@ public: virtual std::shared_ptr getGraphForActiveTokenIds(const std::vector& tokenIds, bool* isActiveNamespace = nullptr) const; virtual std::vector getActiveTokenIdsForId(Id tokenId, Id* declarationId) const; - virtual std::vector getNodeIdsForLocationIds(const std::vector& locationIds) const; - virtual std::vector getLocalSymbolIdsForLocationIds(const std::vector& locationIds) const; - - virtual Id getTokenIdForFileNode(const FilePath& filePath) const; virtual std::shared_ptr getTokenLocationsForTokenIds( const std::vector& tokenIds diff --git a/src/test/StorageTestSuite.h b/src/test/StorageTestSuite.h index ad9d6382..0365dfa9 100644 --- a/src/test/StorageTestSuite.h +++ b/src/test/StorageTestSuite.h @@ -29,7 +29,7 @@ public: storage.inject(intermetiateStorage.get()); - TS_ASSERT_EQUALS(storage.getNameHierarchyForNodeWithId(id).getQualifiedName(), filePath); + TS_ASSERT_EQUALS(storage.getNameHierarchyForNodeId(id).getQualifiedName(), filePath); TS_ASSERT_EQUALS(storage.getNodeTypeForNodeWithId(id), Node::NODE_FILE); } @@ -44,7 +44,7 @@ public: storage.inject(intermetiateStorage.get()); - Id storedId = storage.getIdForNodeWithNameHierarchy(a); + Id storedId = storage.getNodeIdForNameHierarchy(a); TS_ASSERT(storedId != 0); TS_ASSERT_EQUALS(storage.getNodeTypeForNodeWithId(storedId), Node::NODE_TYPEDEF);