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

Clang: Fix wrong QTC_ASSERTS

Browse Source 
If the last editor is closed, "editor" becomes a nullptr, which is valid
value in this case.

Change-Id: Id5f92cb4367199d782e33acc37077103e9986644
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-04-20 13:55:49 +02:00
parent 3d42f98017
commit 787f0498ca
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -243,7 +243,7 @@ const QVector<ClangBackEnd::TokenInfoContainer>
void ClangEditorDocumentProcessor::clearTaskHubIssues() void ClangEditorDocumentProcessor::clearTaskHubIssues()
{ {
m_diagnosticManager.clearTaskHubIssues(); ClangDiagnosticManager::clearTaskHubIssues();
} }
void ClangEditorDocumentProcessor::generateTaskHubIssues() void ClangEditorDocumentProcessor::generateTaskHubIssues()

2
src/plugins/clangcodemodel/clangeditordocumentprocessor.h
View File

@@ -103,7 +103,7 @@ public:
const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos() const; const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos() const;
void clearTaskHubIssues(); static void clearTaskHubIssues();
void generateTaskHubIssues(); void generateTaskHubIssues();
public: public:

12
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -165,14 +165,12 @@ void ModelManagerSupportClang::onCurrentEditorChanged(Core::IEditor *editor)
m_communicator.updateTranslationUnitVisiblity(); m_communicator.updateTranslationUnitVisiblity();
// Update task hub issues for current CppEditorDocument // Update task hub issues for current CppEditorDocument
QTC_ASSERT(editor, return); ClangEditorDocumentProcessor::clearTaskHubIssues();
Core::IDocument *document = editor->document(); if (!editor || !editor->document() || !cppModelManager()->isCppEditor(editor))
QTC_ASSERT(document, return); return;
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(document);
auto processor = ClangEditorDocumentProcessor::get(document->filePath().toString()); const ::Utils::FileName filePath = editor->document()->filePath();
processor->clearTaskHubIssues(); if (auto processor = ClangEditorDocumentProcessor::get(filePath.toString()))
if (textDocument && cppModelManager()->isCppEditor(editor))
processor->generateTaskHubIssues(); processor->generateTaskHubIssues();
} }