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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/libs/utils/filepath.cpp

Change-Id: I04761cf7c99ed67322a592cbd0ae48c1ae9c708a
This commit is contained in:
Eike Ziller
2023-01-25 14:11:01 +01:00
parent f8638019d4 455f9f6911
commit e9b177db7d
7 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7082,12 +7082,13 @@ void TextEditorWidgetPrivate::addSelectionNextFindMatch()
return;
const QTextCursor &firstCursor = cursors.first();
QTextDocumentFragment selection = firstCursor.selection();
const QString selection = firstCursor.selectedText();
if (selection.contains(QChar::ParagraphSeparator))
return;
QTextDocument *document = firstCursor.document();
if (Utils::anyOf(cursors, [&firstCursor](const QTextCursor &c) {
return c.selection().toPlainText().toCaseFolded()
!= firstCursor.selection().toPlainText().toCaseFolded();
if (Utils::anyOf(cursors, [selection = selection.toCaseFolded()](const QTextCursor &c) {
return c.selectedText().toCaseFolded() != selection;
})) {
return;
}
@@ -7096,8 +7097,9 @@ void TextEditorWidgetPrivate::addSelectionNextFindMatch()
int searchFrom = cursors.last().selectionEnd();
while (true) {
QTextCursor next = document->find(selection.toPlainText(), searchFrom, findFlags);
QTextCursor next = document->find(selection, searchFrom, findFlags);
if (next.isNull()) {
QTC_ASSERT(searchFrom != 0, return);
searchFrom = 0;
continue;
}