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

QmlJS: Fix semantic and non-semantic QML error reporting.

Browse Source 
The QML snapshot only ever contains valid Documents; to compile a list
of parser problems we need to get at the invalid documents.

To do that, the model manager now provides a Snapshot with up to date,
but potentially invalid documents. That should also be useful for other
things.

Change-Id: I67892f63771c221bf2fe2c2bf0240a0f4e523227
Reviewed-on: http://codereview.qt.nokia.com/3012
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-16 14:11:30 +02:00
parent ede672c8d9
commit f725c24c56
7 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -169,11 +169,14 @@ ModelManagerInterface::WorkingCopy ModelManager::workingCopy() const
return workingCopy;
}
Snapshot ModelManager::snapshot() const
Snapshot ModelManager::snapshot(bool preferValid) const
{
QMutexLocker locker(&m_mutex);
return _snapshot;
if (preferValid)
return _validSnapshot;
else
return _newestSnapshot;
}
void ModelManager::updateSourceFiles(const QStringList &files,
@@ -228,8 +231,10 @@ void ModelManager::removeFiles(const QStringList &files)
QMutexLocker locker(&m_mutex);
foreach (const QString &file, files)
_snapshot.remove(file);
foreach (const QString &file, files) {
_validSnapshot.remove(file);
_newestSnapshot.remove(file);
}
}
QList<ModelManager::ProjectInfo> ModelManager::projectInfos() const
@@ -257,7 +262,7 @@ void ModelManager::updateProjectInfo(const ProjectInfo &pinfo)
QMutexLocker locker(&m_mutex);
oldInfo = m_projects.value(pinfo.project);
m_projects.insert(pinfo.project, pinfo);
snapshot = _snapshot;
snapshot = _validSnapshot;
}
if (oldInfo.qmlDumpPath != pinfo.qmlDumpPath
@@ -302,7 +307,8 @@ void ModelManager::updateDocument(Document::Ptr doc)
{
{
QMutexLocker locker(&m_mutex);
_snapshot.insert(doc);
_validSnapshot.insert(doc);
_newestSnapshot.insert(doc, true);
}
emit documentUpdated(doc);
}
@@ -311,7 +317,8 @@ void ModelManager::updateLibraryInfo(const QString &path, const LibraryInfo &inf
{
{
QMutexLocker locker(&m_mutex);
_snapshot.insertLibraryInfo(path, info);
_validSnapshot.insertLibraryInfo(path, info);
_newestSnapshot.insertLibraryInfo(path, info);
}
// only emit if we got new useful information
if (info.isValid())
@@ -650,7 +657,7 @@ void ModelManager::updateImportPaths()
m_allImportPaths.removeDuplicates();
// check if any file in the snapshot imports something new in the new paths
Snapshot snapshot = _snapshot;
Snapshot snapshot = _validSnapshot;
QStringList importedFiles;
QSet<QString> scannedPaths;
QSet<QString> newLibraries;
@@ -724,7 +731,7 @@ LibraryInfo ModelManager::builtins(const Document::Ptr &doc) const
if (!info.isValid())
return LibraryInfo();
return _snapshot.libraryInfo(info.qtImportsPath);
return _validSnapshot.libraryInfo(info.qtImportsPath);
}
void ModelManager::joinAllThreads()
@@ -741,11 +748,12 @@ void ModelManager::resetCodeModel()
QMutexLocker locker(&m_mutex);
// find all documents currently in the code model
foreach (Document::Ptr doc, _snapshot)
foreach (Document::Ptr doc, _validSnapshot)
documents.append(doc->fileName());
// reset the snapshot
_snapshot = Snapshot();
_validSnapshot = Snapshot();
_newestSnapshot = Snapshot();
}
// start a reparse thread