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

SyntaxHighlighter: Make setChangeNumbers private function

Browse Source 
Made setChangeNumbers private function in BaseAnnotationHighlighter
and remove usage in other places.
Moved annotationChanges to BaseAnnotationHighlighterPrivate from
VcsBaseEditorWidget.
This was done to move all instances of TextEditor::SyntaxHighlighter.
In this regards only the public API of TextEditor::SyntaxHighlighter
should be available from children and no other additional functions.

Change-Id: Ibece9476a810e13c8722839820d5c575b0808f03
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-05-19 13:03:01 +02:00
parent 6910408f35
commit 84275809b4
28 changed files with 156 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -549,8 +549,8 @@ public:
QRegularExpression m_diffFilePattern;
QRegularExpression m_logEntryPattern;
QRegularExpression m_annotationEntryPattern;
QRegularExpression m_annotationSeparatorPattern;
VcsBase::Annotation m_annotation;
QList<int> m_entrySections; // line number where this section starts
int m_cursorLine = -1;
int m_firstLineNumber = -1;
@@ -665,12 +665,12 @@ void VcsBaseEditorWidget::setLogEntryPattern(const QString &pattern)
void VcsBaseEditorWidget::setAnnotationEntryPattern(const QString &pattern)
{
regexpFromString(pattern, &d->m_annotationEntryPattern, QRegularExpression::MultilineOption);
regexpFromString(pattern, &d->m_annotation.entryPattern, QRegularExpression::MultilineOption);
}
void VcsBaseEditorWidget::setAnnotationSeparatorPattern(const QString &pattern)
{
regexpFromString(pattern, &d->m_annotationSeparatorPattern);
regexpFromString(pattern, &d->m_annotation.separatorPattern);
}
bool VcsBaseEditorWidget::supportChangeLinks() const
@@ -1101,11 +1101,11 @@ void VcsBaseEditorWidget::slotActivateAnnotation()
disconnect(this, &QPlainTextEdit::textChanged, this, &VcsBaseEditorWidget::slotActivateAnnotation);
if (auto ah = qobject_cast<BaseAnnotationHighlighter *>(textDocument()->syntaxHighlighter())) {
ah->setChangeNumbers(changes);
ah->rehighlight();
} else {
BaseAnnotationHighlighterCreator creator = annotationHighlighterCreator();
textDocument()->setSyntaxHighlighterCreator([creator, changes] { return creator(changes); });
textDocument()->setSyntaxHighlighterCreator(
[creator, annotation = d->m_annotation] { return creator(annotation); });
}
}
@@ -1550,12 +1550,12 @@ QSet<QString> VcsBaseEditorWidget::annotationChanges() const
QStringView txt = QStringView(text);
if (txt.isEmpty())
return changes;
if (!d->m_annotationSeparatorPattern.pattern().isEmpty()) {
const QRegularExpressionMatch match = d->m_annotationSeparatorPattern.match(txt);
if (!d->m_annotation.separatorPattern.pattern().isEmpty()) {
const QRegularExpressionMatch match = d->m_annotation.separatorPattern.match(txt);
if (match.hasMatch())
txt.truncate(match.capturedStart());
}
QRegularExpressionMatchIterator i = d->m_annotationEntryPattern.globalMatch(txt);
QRegularExpressionMatchIterator i = d->m_annotation.entryPattern.globalMatch(txt);
while (i.hasNext()) {
const QRegularExpressionMatch match = i.next();
changes.insert(match.captured(1));