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

CppTools: Remove QTC_ASSERT in CppModelManager::editorDocument()

Browse Source 
This fixes

    SOFT ASSERT: "!filePath.isEmpty()" in file
    /home/nik/dev/creator/creator-ut/src/plugins/cpptools/cppmodelmanager.cpp,
    line 467

which can be triggered by e.g. a "git show" document
(onCurrentEditorChanged does not check for an empty file path).

Change-Id: If4ed8e552069b290cb4ac93da52427b7ed2b91e8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-12-03 12:11:48 +01:00
parent 64d6d64c93
commit 6b894b50e6
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -464,7 +464,8 @@ void CppModelManager::removeExtraEditorSupport(AbstractEditorSupport *editorSupp
EditorDocumentHandle *CppModelManager::editorDocument(const QString &filePath) const
{
QTC_ASSERT(!filePath.isEmpty(), return 0);
if (filePath.isEmpty())
return 0;
QMutexLocker locker(&d->m_cppEditorsMutex);
return d->m_cppEditors.value(filePath, 0);
@@ -697,12 +698,9 @@ void CppModelManager::updateCppEditorDocuments() const
QSet<Core::IDocument *> visibleCppEditorDocuments;
foreach (Core::IEditor *editor, Core::EditorManager::visibleEditors()) {
if (Core::IDocument *document = editor->document()) {
const QString filePath = document->filePath();
if (filePath.isEmpty())
continue;
if (EditorDocumentHandle *editor = editorDocument(filePath)) {
if (EditorDocumentHandle *cppEditorDocument = editorDocument(document->filePath())) {
visibleCppEditorDocuments.insert(document);
editor->processor()->run();
cppEditorDocument->processor()->run();
}
}
}
@@ -712,11 +710,8 @@ void CppModelManager::updateCppEditorDocuments() const
= Core::DocumentModel::openedDocuments().toSet();
invisibleCppEditorDocuments.subtract(visibleCppEditorDocuments);
foreach (Core::IDocument *document, invisibleCppEditorDocuments) {
const QString filePath = document->filePath();
if (filePath.isEmpty())
continue;
if (EditorDocumentHandle *document = editorDocument(filePath))
document->setNeedsRefresh(true);
if (EditorDocumentHandle *cppEditorDocument = editorDocument(document->filePath()))
cppEditorDocument->setNeedsRefresh(true);
}
}