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

Core: Use FilePath to track document entries

Browse Source 
Change-Id: Iba11a412067215109a1be4579620ebf80c8c2da1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-06-11 10:08:28 +02:00
parent b6f6ce9753
commit d2c1fa6b2d
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -599,6 +599,13 @@ QString DocumentManager::filePathKey(const QString &filePath, ResolveMode resolv
return s;
}
FilePath DocumentManager::filePathKey(const Utils::FilePath &filePath, ResolveMode resolveMode)
{
if (resolveMode == ResolveLinks)
return filePath.canonicalPath().absoluteFilePath();
return filePath.absoluteFilePath();
}
/*!
Returns the list of IDocuments that have been modified.
*/

1
src/plugins/coreplugin/documentmanager.h
View File

@@ -78,6 +78,7 @@ public:
// helper functions
static QString cleanAbsoluteFilePath(const QString &filePath, ResolveMode resolveMode);
static QString filePathKey(const QString &filePath, ResolveMode resolveMode);
static Utils::FilePath filePathKey(const Utils::FilePath &filePath, ResolveMode resolveMode);
static bool saveDocument(IDocument *document,
const Utils::FilePath &filePath = Utils::FilePath(),

25
src/plugins/coreplugin/editormanager/documentmodel.cpp
View File

@@ -103,13 +103,10 @@ int DocumentModelPrivate::rowCount(const QModelIndex &parent) const
void DocumentModelPrivate::addEntry(DocumentModel::Entry *entry)
{
const Utils::FilePath fileName = entry->fileName();
QString fixedPath;
if (!fileName.isEmpty())
fixedPath = DocumentManager::filePathKey(fileName.toString(), DocumentManager::ResolveLinks);
const Utils::FilePath filePath = entry->fileName();
// replace a non-loaded entry (aka 'suspended') if possible
DocumentModel::Entry *previousEntry = DocumentModel::entryForFilePath(fileName);
DocumentModel::Entry *previousEntry = DocumentModel::entryForFilePath(filePath);
if (previousEntry) {
const bool replace = !entry->isSuspended && previousEntry->isSuspended;
if (replace) {
@@ -133,6 +130,7 @@ void DocumentModelPrivate::addEntry(DocumentModel::Entry *entry)
beginInsertRows(QModelIndex(), row, row);
m_entries.insert(positions.second, entry);
disambiguateDisplayNames(entry);
FilePath fixedPath = DocumentManager::filePathKey(filePath, DocumentManager::ResolveLinks);
if (!fixedPath.isEmpty())
m_entryByFixedPath[fixedPath] = entry;
connect(entry->document, &IDocument::changed, this, [this, document = entry->document] {
@@ -231,8 +229,7 @@ Utils::optional<int> DocumentModelPrivate::indexOfFilePath(const Utils::FilePath
{
if (filePath.isEmpty())
return Utils::nullopt;
const QString fixedPath = DocumentManager::filePathKey(filePath.toString(),
DocumentManager::ResolveLinks);
const FilePath fixedPath = DocumentManager::filePathKey(filePath, DocumentManager::ResolveLinks);
const int index = m_entries.indexOf(m_entryByFixedPath.value(fixedPath));
if (index < 0)
return Utils::nullopt;
@@ -249,12 +246,10 @@ void DocumentModelPrivate::removeDocument(int idx)
DocumentModel::Entry *entry = m_entries.takeAt(idx);
endRemoveRows();
const QString fileName = entry->fileName().toString();
if (!fileName.isEmpty()) {
const QString fixedPath = DocumentManager::filePathKey(fileName,
DocumentManager::ResolveLinks);
const FilePath fixedPath = DocumentManager::filePathKey(entry->fileName(),
DocumentManager::ResolveLinks);
if (!fixedPath.isEmpty())
m_entryByFixedPath.remove(fixedPath);
}
disconnect(entry->document, &IDocument::changed, this, nullptr);
disambiguateDisplayNames(entry);
delete entry;
@@ -350,10 +345,8 @@ void DocumentModelPrivate::itemChanged(IDocument *document)
const Utils::optional<int> idx = indexOfDocument(document);
if (!idx)
return;
const QString fileName = document->filePath().toString();
QString fixedPath;
if (!fileName.isEmpty())
fixedPath = DocumentManager::filePathKey(fileName, DocumentManager::ResolveLinks);
const FilePath fixedPath = DocumentManager::filePathKey(document->filePath(),
DocumentManager::ResolveLinks);
DocumentModel::Entry *entry = m_entries.at(idx.value());
bool found = false;
// The entry's fileName might have changed, so find the previous fileName that was associated

2
src/plugins/coreplugin/editormanager/documentmodel_p.h
View File

@@ -97,7 +97,7 @@ public:
QList<DocumentModel::Entry *> m_entries;
QMap<IDocument *, QList<IEditor *> > m_editors;
QHash<QString, DocumentModel::Entry *> m_entryByFixedPath;
QHash<Utils::FilePath, DocumentModel::Entry *> m_entryByFixedPath;
};
} // Internal