thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3938: line comment start is also found in a string

Browse Source 
Problem:    Line comment start is also found in a string.
Solution:   Skip line comments in a string.
This commit is contained in:
Bram Moolenaar
2021-12-29 18:09:13 +00:00
parent edc6f10390
commit ba26367fea
5 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/search.c
View File

@@ -2714,7 +2714,6 @@ findmatchlimit(
/*
* Check if line[] contains a / / comment.
* Return MAXCOL if not, otherwise return the column.
* TODO: skip strings.
*/
int
check_linecomment(char_u *line)
@@ -2746,7 +2745,8 @@ check_linecomment(char_u *line)
in_str = TRUE;
}
else if (!in_str && ((p - line) < 2
|| (*(p - 1) != '\\' && *(p - 2) != '#')))
|| (*(p - 1) != '\\' && *(p - 2) != '#'))
&& !is_pos_in_string(line, (colnr_T)(p - line)))
break; // found!
++p;
}
@@ -2758,9 +2758,11 @@ check_linecomment(char_u *line)
#endif
while ((p = vim_strchr(p, '/')) != NULL)
{
// accept a double /, unless it's preceded with * and followed by *,
// because * / / * is an end and start of a C comment
if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*'))
// Accept a double /, unless it's preceded with * and followed by *,
// because * / / * is an end and start of a C comment.
// Only accept the position if it is not inside a string.
if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*')
&& !is_pos_in_string(line, (colnr_T)(p - line)))
break;
++p;
}