logic: fixed names of file nodes that are target of macro use edge

* fixed name of macro use edge target
* fixed generating a file nodes full path in SqliteStorage

src/lib/data/PersistentStorage.cpp

@@ -962,12 +962,13 @@ std::vector<Id> PersistentStorage::getLocalSymbolIdsForLocationIds(const std::ve
 
 std::vector<Id> PersistentStorage::getTokenIdsForMatches(const std::vector<SearchMatch>& matches) const
 {
+	FilePath rootPath = getDbFilePath().parentDirectory();
 	std::set<Id> idSet;
 	for (const SearchMatch& match : matches)
 	{
 		if (match.nodeType == Node::NODE_FILE)
 		{
-			idSet.insert(m_sqliteStorage.getFileByPath(match.name).id);
+			idSet.insert(m_sqliteStorage.getFileByPath(rootPath.concat(match.subtext).str()).id);
 		}
 		else
 		{

src/lib/data/SqliteStorage.cpp

@@ -12,7 +12,7 @@
 const size_t SqliteStorage::STORAGE_VERSION = 8;
 
 SqliteStorage::SqliteStorage(const FilePath& dbFilePath)
-	: m_dbFilePath(dbFilePath)
+	: m_dbFilePath(dbFilePath.canonical())
 {
 	m_database.open(m_dbFilePath.str().c_str());