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

Nim: Fixed missing update of project files on add and remove

Browse Source 
Change-Id: Iadbd5b9b04dcb16f53a16263f94f8f44835e5793
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Filippo Cucchetto
2016-12-03 13:34:01 +01:00
parent 6fd185d32d
commit 2b159ac9c9
5 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/nim/project/nimproject.cpp
View File

@@ -98,6 +98,29 @@ void NimProject::scheduleProjectScan()
}
}
bool NimProject::addFiles(const QStringList &filePaths)
{
m_excludedFiles = Utils::filtered(m_excludedFiles, [&](const QString &f) { return !filePaths.contains(f); });
scheduleProjectScan();
return true;
}
bool NimProject::removeFiles(const QStringList &filePaths)
{
m_excludedFiles.append(filePaths);
m_excludedFiles = Utils::filteredUnique(m_excludedFiles);
scheduleProjectScan();
return true;
}
bool NimProject::renameFile(const QString &filePath, const QString &newFilePath)
{
Q_UNUSED(filePath)
m_excludedFiles.removeOne(newFilePath);
scheduleProjectScan();
return true;
}
void NimProject::collectProjectFiles()
{
m_lastProjectScan.start();
@@ -116,9 +139,11 @@ void NimProject::updateProject()
m_files.clear();
QList<FileNode *> fileNodes = Utils::filtered(m_futureWatcher.future().result(),
[](const FileNode *fn) {
const QString fileName = fn->filePath().fileName();
const bool keep = !fileName.endsWith(".nimproject", HostOsInfo::fileNameCaseSensitivity())
[&](const FileNode *fn) {
const FileName path = fn->filePath();
const QString fileName = path.fileName();
const bool keep = !m_excludedFiles.contains(path.toString())
&& !fileName.endsWith(".nimproject", HostOsInfo::fileNameCaseSensitivity())
&& !fileName.contains(".nimproject.user", HostOsInfo::fileNameCaseSensitivity());
if (!keep)
delete fn;
@@ -162,4 +187,17 @@ FileNameList NimProject::nimFiles() const
return result;
}
QVariantMap NimProject::toMap() const
{
QVariantMap result = Project::toMap();
result[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles;
return result;
}
Project::RestoreResult NimProject::fromMap(const QVariantMap &map, QString *errorMessage)
{
m_excludedFiles = map.value(Constants::C_NIMPROJECT_EXCLUDEDFILES).toStringList();
return Project::fromMap(map, errorMessage);
}
}