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

QmlJSEditor: Move ownership of QmlJSTextMarks to document

Browse Source 
Task-number: QTCREATORBUG-19607
Change-Id: I65fa11b43dcbe3c28ab100a1636ad592cfff5a4d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2018-01-22 10:45:04 +01:00
parent 63e47f903f
commit f9c959cee2
4 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/qmljseditor/qmljseditordocument.cpp
View File

@@ -32,6 +32,7 @@
#include "qmljsquickfixassist.h"
#include "qmljssemantichighlighter.h"
#include "qmljssemanticinfoupdater.h"
#include "qmljstextmark.h"
#include "qmloutlinemodel.h"
#include <coreplugin/coreconstants.h>
@@ -521,10 +522,13 @@ void QmlJSEditorDocumentPrivate::onDocumentUpdated(Document::Ptr doc)
if (doc->editorRevision() != q->document()->revision())
return;
cleanDiagnosticMarks();
if (doc->ast()) {
// got a correctly parsed (or recovered) file.
m_semanticInfoDocRevision = doc->editorRevision();
m_semanticInfoUpdater->update(doc, ModelManagerInterface::instance()->snapshot());
} else if (doc->language().isFullySupportedLanguage()) {
createTextMarks(doc->diagnosticMessages());
}
emit q->updateCodeWarnings(doc);
}
@@ -573,6 +577,7 @@ void QmlJSEditorDocumentPrivate::acceptNewSemanticInfo(const SemanticInfo &seman
}
}
createTextMarks(m_semanticInfo);
emit q->semanticInfoUpdated(m_semanticInfo); // calls triggerPendingUpdates as necessary
}
@@ -584,6 +589,61 @@ void QmlJSEditorDocumentPrivate::updateOutlineModel()
m_outlineModel->update(m_semanticInfo);
}
static void cleanMarks(QVector<TextEditor::TextMark *> *marks, TextEditor::TextDocument *doc)
{
for (TextEditor::TextMark *mark : *marks) {
doc->removeMark(mark);
delete mark;
}
marks->clear();
}
void QmlJSEditorDocumentPrivate::createTextMarks(const QList<DiagnosticMessage> &diagnostics)
{
for (const DiagnosticMessage &diagnostic : diagnostics) {
const auto onMarkRemoved = [this](QmlJSTextMark *mark) {
m_diagnosticMarks.removeAll(mark);
delete mark;
};
auto mark = new QmlJSTextMark(q->filePath().toString(),
diagnostic, onMarkRemoved);
m_diagnosticMarks.append(mark);
q->addMark(mark);
}
}
void QmlJSEditorDocumentPrivate::cleanDiagnosticMarks()
{
cleanMarks(&m_diagnosticMarks, q);
}
void QmlJSEditorDocumentPrivate::createTextMarks(const SemanticInfo &info)
{
cleanSemanticMarks();
const auto onMarkRemoved = [this](QmlJSTextMark *mark) {
m_semanticMarks.removeAll(mark);
delete mark;
};
for (const DiagnosticMessage &diagnostic : info.semanticMessages) {
auto mark = new QmlJSTextMark(q->filePath().toString(),
diagnostic, onMarkRemoved);
m_semanticMarks.append(mark);
q->addMark(mark);
}
for (const QmlJS::StaticAnalysis::Message &message : info.staticAnalysisMessages) {
auto mark = new QmlJSTextMark(q->filePath().toString(),
message, onMarkRemoved);
m_semanticMarks.append(mark);
q->addMark(mark);
}
}
void QmlJSEditorDocumentPrivate::cleanSemanticMarks()
{
cleanMarks(&m_semanticMarks, q);
}
} // Internal
QmlJSEditorDocument::QmlJSEditorDocument()