callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EWebKitEditor: Prevent Replace-all to cycle indefinitely in some cases

Browse Source 
In case the search and the replace words are similar (like changing
capitals or such and searching case insensitively), the search can
repeat indefinitely for replace all. This makes the Replace-all
use only search from the top of the document to the bottom, without
wrap around, thus it'll stop at the end of the document on its own.
This commit is contained in:
Milan Crha
2020-03-06 10:22:14 +01:00
parent 29b3cd21b6
commit 2b7b2c61fb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/webkit-editor/e-webkit-editor.c
+6 -1
View File
@@ -2843,7 +2843,10 @@ webkit_editor_replace_all (EContentEditor *editor,
wk_editor = E_WEBKIT_EDITOR (editor);
wk_options = find_flags_to_webkit_find_options (flags);
wk_options |= WEBKIT_FIND_OPTIONS_WRAP_AROUND;
/* Unset the two, because replace-all will be always from the beginning
of the document downwards, without wrap around, to avoid indefinite
cycle with similar search and replace words. */
wk_options = wk_options & (~(WEBKIT_FIND_OPTIONS_BACKWARDS | WEBKIT_FIND_OPTIONS_WRAP_AROUND));
if (!wk_editor->priv->find_controller)
webkit_editor_prepare_find_controller (wk_editor);
@@ -2854,6 +2857,8 @@ webkit_editor_replace_all (EContentEditor *editor,
wk_editor->priv->performing_replace_all = TRUE;
wk_editor->priv->replaced_count = 0;
webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (wk_editor), "MoveToBeginningOfDocumentAndModifySelection");
webkit_find_controller_search (wk_editor->priv->find_controller, find_text, wk_options, G_MAXUINT);
}