feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Improve FolderNode::buildTree

Browse Source 
Treat absolute paths more intelligently in FolderNode::buildTree: Add
them with their absolute paths instead of endless sequences of ..

Change-Id: I9d644588f91f1792f997dedfb20e68d210b9cf73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-13 17:29:06 +01:00
parent bfa456072c
commit c888989a41
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -33,8 +33,10 @@
#include <coreplugin/icore.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <QFileInfo>
@@ -401,20 +403,29 @@ FolderNode *FolderNode::folderNode(const Utils::FileName &directory) const
}));
}
FolderNode *FolderNode::recursiveFindOrCreateFolderNode(const QString &directory,
FolderNode *FolderNode::recursiveFindOrCreateFolderNode(const Utils::FileName &directory,
const Utils::FileName &overrideBaseDir)
{
Utils::FileName path = overrideBaseDir.isEmpty() ? filePath() : overrideBaseDir;
QString workPath;
Utils::FileName directoryWithoutPrefix;
bool isRelative = false;
if (path.isEmpty() || path.toFileInfo().isRoot()) {
workPath = directory;
directoryWithoutPrefix = directory;
isRelative = false;
} else {
QDir parentDir(path.toString());
workPath = parentDir.relativeFilePath(directory);
if (workPath == ".")
workPath.clear();
if (directory.isChildOf(path) || directory == path) {
isRelative = true;
directoryWithoutPrefix = directory.relativeChildPath(path);
} else {
isRelative = false;
directoryWithoutPrefix = directory;
}
}
const QStringList parts = workPath.split('/', QString::SkipEmptyParts);
QStringList parts = directoryWithoutPrefix.toString().split('/', QString::SkipEmptyParts);
if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && parts.count() > 0)
parts[0].prepend('/');
ProjectExplorer::FolderNode *parent = this;
foreach (const QString &part, parts) {
@@ -440,7 +451,8 @@ void FolderNode::buildTree(QList<FileNode *> &files, const Utils::FileName &over
foreach (ProjectExplorer::FileNode *fn, files) {
// Get relative path to rootNode
QString parentDir = fn->filePath().toFileInfo().absolutePath();
ProjectExplorer::FolderNode *folder = recursiveFindOrCreateFolderNode(parentDir, overrideBaseDir);
ProjectExplorer::FolderNode *folder
= recursiveFindOrCreateFolderNode(Utils::FileName::fromString(parentDir), overrideBaseDir);
folder->addNode(fn);
}