HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor document_replace_range() with search_replace_range().

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/gnu-regex@4739 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-03-08 13:23:32 +00:00
parent c8bac32a8a
commit 361b128d81
2 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* src/search.c: * src/search.c:
Implement POSIX-regex Find All. Implement POSIX-regex Find All.
* src/document.c:
Refactor document_replace_range() with search_replace_range().
2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

75
src/document.c
View File

@ -2086,42 +2086,27 @@ static void show_replace_summary(GeanyDocument *doc, gint count, const gchar *fi
} }
/* Replace all text matches in a certain range within document. /* ttf is updated to include the last match positions.
* If not NULL, *new_range_end is set to the new range endpoint after replacing, * Note: Normally you would call sci_start/end_undo_action() around this call. */
* or -1 if no text was found. static guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf,
* scroll_to_match is whether to scroll the last replacement in view (which also gint flags, const gchar *replace_text)
* clears the selection).
* Returns: the number of replacements made. */
static guint
document_replace_range(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text,
gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end)
{ {
gint count = 0; gint count = 0;
struct Sci_TextToFind ttf; const gchar *find_text = ttf->lpstrText;
ScintillaObject *sci; gint start = ttf->chrg.cpMin;
gint end = ttf->chrg.cpMax;
if (new_range_end != NULL) g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0);
*new_range_end = -1; if (! *find_text)
g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0);
if (! *find_text || doc->readonly)
return 0; return 0;
sci = doc->editor->sci;
sci_start_undo_action(sci);
ttf.chrg.cpMin = start;
ttf.chrg.cpMax = end;
ttf.lpstrText = (gchar*)find_text;
while (TRUE) while (TRUE)
{ {
gint search_pos; gint search_pos;
gint find_len = 0, replace_len = 0; gint find_len = 0, replace_len = 0;
search_pos = sci_find_text(sci, flags, &ttf); search_pos = sci_find_text(sci, flags, ttf);
find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin;
if (search_pos == -1) if (search_pos == -1)
break; /* no more matches */ break; /* no more matches */
if (find_len == 0 && ! NZV(replace_text)) if (find_len == 0 && ! NZV(replace_text))
@ -2153,11 +2138,45 @@ document_replace_range(GeanyDocument *doc, const gchar *find_text, const gchar *
start = search_pos + replace_len + movepastEOL; start = search_pos + replace_len + movepastEOL;
if (find_len == 0) if (find_len == 0)
start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */ start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */
ttf.chrg.cpMin = start; ttf->chrg.cpMin = start;
end += replace_len - find_len; /* update end of range now text has changed */ end += replace_len - find_len; /* update end of range now text has changed */
ttf.chrg.cpMax = end; ttf->chrg.cpMax = end;
} }
} }
return count;
}
/* Replace all text matches in a certain range within document.
* If not NULL, *new_range_end is set to the new range endpoint after replacing,
* or -1 if no text was found.
* scroll_to_match is whether to scroll the last replacement in view (which also
* clears the selection).
* Returns: the number of replacements made. */
static guint
document_replace_range(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text,
gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end)
{
gint count = 0;
struct Sci_TextToFind ttf;
ScintillaObject *sci;
if (new_range_end != NULL)
*new_range_end = -1;
g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0);
if (! *find_text || doc->readonly)
return 0;
sci = doc->editor->sci;
ttf.chrg.cpMin = start;
ttf.chrg.cpMax = end;
ttf.lpstrText = (gchar*)find_text;
sci_start_undo_action(sci);
count = search_replace_range(sci, &ttf, flags, replace_text);
sci_end_undo_action(sci); sci_end_undo_action(sci);
if (count > 0) if (count > 0)