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

SyntaxHighlighter: Fix tst_highlighter

Browse Source 
Change-Id: I96c6c7b9843384d14bfa37b6bfdd494c881949af
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-12-14 16:04:07 +01:00
parent 75819c4903
commit d8561ccb2d
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,10 @@ public:
} }
SyntaxHighlighterRunnerPrivate(BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator creator, SyntaxHighlighterRunnerPrivate(BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator creator,
QTextDocument *document) QTextDocument *document, FontSettings fontSettings)
: m_creator(creator) : m_creator(creator)
, m_document(document) , m_document(document)
, m_fontSettings(fontSettings)
{ {
m_highlighter.reset(m_creator()); m_highlighter.reset(m_creator());
createHighlighter(); createHighlighter();
@@ -109,14 +110,16 @@ private:
BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator m_creator; BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator m_creator;
std::unique_ptr<SyntaxHighlighter> m_highlighter; std::unique_ptr<SyntaxHighlighter> m_highlighter;
QTextDocument *m_document = nullptr; QTextDocument *m_document = nullptr;
const FontSettings m_fontSettings = TextEditorSettings::fontSettings(); FontSettings m_fontSettings;
}; };
// ----------------------------- BaseSyntaxHighlighterRunner -------------------------------------- // ----------------------------- BaseSyntaxHighlighterRunner --------------------------------------
BaseSyntaxHighlighterRunner::BaseSyntaxHighlighterRunner( BaseSyntaxHighlighterRunner::BaseSyntaxHighlighterRunner(
BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator creator, QTextDocument *document) BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator creator,
: d(new SyntaxHighlighterRunnerPrivate(creator, document)) QTextDocument *document,
const TextEditor::FontSettings &fontSettings)
: d(new SyntaxHighlighterRunnerPrivate(creator, document, fontSettings))
{ {
m_document = document; m_document = document;
} }

7
src/plugins/texteditor/syntaxhighlighterrunner.h
View File

@@ -3,7 +3,9 @@
#pragma once #pragma once
#include <texteditor/fontsettings.h>
#include <texteditor/syntaxhighlighter.h> #include <texteditor/syntaxhighlighter.h>
#include <texteditor/texteditorsettings.h>
#include <KSyntaxHighlighting/Definition> #include <KSyntaxHighlighting/Definition>
@@ -28,7 +30,10 @@ public:
QString text; QString text;
}; };
BaseSyntaxHighlighterRunner(SyntaxHighLighterCreator creator, QTextDocument *document); BaseSyntaxHighlighterRunner(SyntaxHighLighterCreator creator,
QTextDocument *document,
const TextEditor::FontSettings &fontSettings
= TextEditorSettings::fontSettings());
virtual ~BaseSyntaxHighlighterRunner(); virtual ~BaseSyntaxHighlighterRunner();
void setExtraFormats(const QMap<int, QList<QTextLayout::FormatRange>> &formats); void setExtraFormats(const QMap<int, QList<QTextLayout::FormatRange>> &formats);

6
tests/auto/texteditor/highlighter/tst_highlighter.cpp
View File

@@ -56,13 +56,11 @@ Second with spaces
Last)"; Last)";
doc = new QTextDocument(); doc = new QTextDocument();
doc->setPlainText(text); doc->setPlainText(text);
highlighterRunner highlighterRunner = new BaseSyntaxHighlighterRunner(
= new BaseSyntaxHighlighterRunner([this] { return new SyntaxHighlighter(doc, fontsettings); }, [this] { return new SyntaxHighlighter(doc, fontsettings); }, doc, fontsettings);
doc);
} }
static const HighlightingResults &highlightingResults() static const HighlightingResults &highlightingResults()