ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

search: begin from where we are, to be able to find the first \B 

A search should start at the place of the cursor, not one step beyond,
so that the non-word boundary between the current character and the next
will be found.  Starting one step beyond the current character, as was
done until now, would find the non-word boundary between the next and
the overnext character as the first one.
master
Benno Schulenberg 2017-01-13 16:11:47 +01:00
parent 9f884810b6
commit c88d7ce530
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/search.c
View File

@ -245,24 +245,15 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
int feedback = 0;
/* When bigger than zero, show and wipe the "Searching..." message. */
filestruct *line = openfile->current;
const char *from = line->data, *found = NULL;
/* The line that we will search through now. */
const char *from = line->data + openfile->current_x;
/* The point in the line from where we start searching. */
const char *found = NULL;
/* A pointer to the location of the match, if any. */
size_t found_x;
/* The x coordinate of a found occurrence. */
time_t lastkbcheck = time(NULL);
/* 'from' might end up 1 character before the start or after the end
* of the line. This is fine because in that case strstrwrapper()
* will return immediately and say that no match was found, and
* 'from' will be properly set when the search continues on the
* previous or next line. */
if (ISSET(BACKWARDS_SEARCH)) {
if (openfile->current_x == 0)
from += -1;
else
from += move_mbleft(line->data, openfile->current_x);
} else
from += move_mbright(line->data, openfile->current_x);
enable_nodelay();
if (begin == NULL)
@ -295,6 +286,19 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
/* Search for the needle in the current line. */
found = strstrwrapper(line->data, needle, from);
/* Ignore the initial match at the starting position: continue
* searching from the next character, or invalidate the match. */
if (found == begin->data + begin_x && !came_full_circle) {
if (ISSET(BACKWARDS_SEARCH) && from != line->data) {
from = line->data + move_mbleft(line->data, from - line->data);
continue;
} else if (!ISSET(BACKWARDS_SEARCH) && *from != '\0') {
from += move_mbright(from, 0);
continue;
}
found = NULL;
}
if (found != NULL) {
#ifdef HAVE_REGEX_H
/* When doing a regex search, compute the length of the match. */

5
src/utils.c
View File

@ -324,11 +324,6 @@ bool is_separate_word(size_t position, size_t length, const char *buf)
const char *strstrwrapper(const char *haystack, const char *needle,
const char *start)
{
/* start can be 1 character before the start or after the end of the
* line. In either case, we just say no match was found. */
if ((start > haystack && *(start - 1) == '\0') || start < haystack)
return NULL;
#ifdef HAVE_REGEX_H
if (ISSET(USE_REGEXP)) {
if (ISSET(BACKWARDS_SEARCH)) {