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

TextEditor: fix double delete in synchronous syntax highlighter

Browse Source 
Change-Id: Ic4b9b78e5464613b9982814d771925d41f88bb25
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
This commit is contained in:
David Schulz
2024-02-08 13:45:47 +01:00
parent cf7f9dffd5
commit e3bbace665
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/texteditor/syntaxhighlighterrunner.cpp
View File

@@ -33,20 +33,21 @@ public:
const QString &mimeType, const QString &mimeType,
FontSettings fontSettings) FontSettings fontSettings)
{ {
m_highlighter = creator();
m_highlighter->setFontSettings(fontSettings);
m_highlighter->setMimeType(mimeType);
if (async) { if (async) {
m_document = new QTextDocument(this); m_document = new QTextDocument(this);
m_document->setDocumentLayout(new TextDocumentLayout(m_document)); m_document->setDocumentLayout(new TextDocumentLayout(m_document));
m_highlighter->setParent(m_document);
} else { } else {
m_document = document; m_document = document;
} }
m_highlighter.reset(creator());
m_highlighter->setFontSettings(fontSettings);
m_highlighter->setDocument(m_document); m_highlighter->setDocument(m_document);
m_highlighter->setMimeType(mimeType);
m_highlighter->setParent(m_document);
connect(m_highlighter.get(), connect(m_highlighter,
&SyntaxHighlighter::resultsReady, &SyntaxHighlighter::resultsReady,
this, this,
&SyntaxHighlighterRunnerPrivate::resultsReady); &SyntaxHighlighterRunnerPrivate::resultsReady);
@@ -102,7 +103,7 @@ public:
void rehighlight() { m_highlighter->rehighlight(); } void rehighlight() { m_highlighter->rehighlight(); }
std::unique_ptr<SyntaxHighlighter> m_highlighter; SyntaxHighlighter *m_highlighter = nullptr;
QTextDocument *m_document = nullptr; QTextDocument *m_document = nullptr;
signals: signals:
@@ -118,7 +119,7 @@ SyntaxHighlighterRunner::SyntaxHighlighterRunner(SyntaxHighlighterCreator creato
: d(new SyntaxHighlighterRunnerPrivate(creator, document, async, mimeType, fontSettings)) : d(new SyntaxHighlighterRunnerPrivate(creator, document, async, mimeType, fontSettings))
, m_document(document) , m_document(document)
{ {
m_useGenericHighlighter = qobject_cast<Highlighter *>(d->m_highlighter.get()); m_useGenericHighlighter = qobject_cast<Highlighter *>(d->m_highlighter);
if (async) { if (async) {
m_thread.emplace(); m_thread.emplace();
@@ -163,6 +164,7 @@ SyntaxHighlighterRunner::~SyntaxHighlighterRunner()
m_thread->quit(); m_thread->quit();
m_thread->wait(); m_thread->wait();
} else { } else {
delete d->m_highlighter;
delete d; delete d;
} }
} }