mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 06:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Jan Edmund Lazo
2019-06-21 07:31:42 -04:00
parent 83ef740e15
commit 8bc365c886
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@@ -14715,7 +14715,7 @@ do_searchpair(
/* clear the start flag to avoid getting stuck here */ /* clear the start flag to avoid getting stuck here */
options &= ~SEARCH_START; options &= ~SEARCH_START;
/* If the skip pattern matches, ignore this match. */ // If the skip pattern matches, ignore this match.
if (use_skip) { if (use_skip) {
save_pos = curwin->w_cursor; save_pos = curwin->w_cursor;
curwin->w_cursor = pos; curwin->w_cursor = pos;

1
src/nvim/misc1.c
View File

@@ -1765,6 +1765,7 @@ del_lines (
} }
int gchar_pos(pos_T *pos) int gchar_pos(pos_T *pos)
FUNC_ATTR_NONNULL_ARG(1)
{ {
// When searching columns is sometimes put at the end of a line. // When searching columns is sometimes put at the end of a line.
if (pos->col == MAXCOL) { if (pos->col == MAXCOL) {

18
src/nvim/search.c
View File

@@ -3370,7 +3370,6 @@ current_tagblock(
) )
{ {
long count = count_arg; long count = count_arg;
long n;
pos_T old_pos; pos_T old_pos;
pos_T start_pos; pos_T start_pos;
pos_T end_pos; pos_T end_pos;
@@ -3379,7 +3378,6 @@ current_tagblock(
char_u *p; char_u *p;
char_u *cp; char_u *cp;
int len; int len;
int r;
bool do_include = include; bool do_include = include;
bool save_p_ws = p_ws; bool save_p_ws = p_ws;
int retval = FAIL; int retval = FAIL;
@@ -3428,12 +3426,12 @@ again:
* Search backwards for unclosed "<aaa>". * Search backwards for unclosed "<aaa>".
* Put this position in start_pos. * Put this position in start_pos.
*/ */
for (n = 0; n < count; ++n) { for (long n = 0; n < count; n++) {
if (do_searchpair((char_u *) if (do_searchpair(
"<[^ \t>/!]\\+\\%(\\_s\\_[^>]\\{-}[^/]>\\|$\\|\\_s\\=>\\)", (char_u *)"<[^ \t>/!]\\+\\%(\\_s\\_[^>]\\{-}[^/]>\\|$\\|\\_s\\=>\\)",
(char_u *)"", (char_u *)"",
(char_u *)"</[^>]*>", BACKWARD, NULL, 0, (char_u *)"</[^>]*>", BACKWARD, NULL, 0,
NULL, (linenr_T)0, 0L) <= 0) { NULL, (linenr_T)0, 0L) <= 0) {
curwin->w_cursor = old_pos; curwin->w_cursor = old_pos;
goto theend; goto theend;
} }
@@ -3459,8 +3457,8 @@ again:
sprintf((char *)spat, "<%.*s\\>\\%%(\\s\\_[^>]\\{-}[^/]>\\|>\\)\\c", len, p); sprintf((char *)spat, "<%.*s\\>\\%%(\\s\\_[^>]\\{-}[^/]>\\|>\\)\\c", len, p);
sprintf((char *)epat, "</%.*s>\\c", len, p); sprintf((char *)epat, "</%.*s>\\c", len, p);
r = do_searchpair(spat, (char_u *)"", epat, FORWARD, NULL, const int r = do_searchpair(spat, (char_u *)"", epat, FORWARD, NULL,
0, NULL, (linenr_T)0, 0L); 0, NULL, (linenr_T)0, 0L);
xfree(spat); xfree(spat);
xfree(epat); xfree(epat);