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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Change-Id: I0ee9c73d7a7e12f98f88b161c35d00ada069cc9d
This commit is contained in:
Eike Ziller
2023-11-21 14:46:01 +01:00
parent 8608dc9556 4f9cf826d6
commit c75a3bcd5d
13 changed files with 2835 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/texteditor/texteditor.cpp
View File

@@ -1929,6 +1929,7 @@ void TextEditorWidgetPrivate::foldLicenseHeader()
if (TextDocumentLayout::canFold(block) && block.next().isVisible()) {
const QString trimmedText = text.trimmed();
QStringList commentMarker;
QStringList docMarker;
if (auto highlighter = qobject_cast<Highlighter *>(
q->textDocument()->syntaxHighlighter())) {
const HighlighterHelper::Definition def = highlighter->definition();
@@ -1939,11 +1940,19 @@ void TextEditorWidgetPrivate::foldLicenseHeader()
}
} else {
commentMarker = QStringList({"/*", "#"});
docMarker = QStringList({"/*!", "/**"});
}
if (Utils::anyOf(commentMarker, [&](const QString &marker) {
return trimmedText.startsWith(marker);
})) {
if (Utils::anyOf(docMarker, [&](const QString &marker) {
return trimmedText.startsWith(marker)
&& (trimmedText.size() == marker.size()
|| trimmedText.at(marker.size()).isSpace());
})) {
break;
}
TextDocumentLayout::doFoldOrUnfold(block, false);
moveCursorVisible();
documentLayout->requestUpdate();