mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ticket #3487: mcedit: fixed invalid syntax highlighting 

...when both context and keyword end with a newline.

To reproduce, create .c or .cxx file and open it in mcedit:

\#endif // preprocessor macro with one-line comment
int code; /* <-- this line is colorized incorrectly */
int code2; /* <-- next line is colorized properly */

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Sergii Pylypenko 2019-02-07 20:21:43 +02:00 committed by Andrew Borodin
parent e806c2bac6
commit 49493dc8e0
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/editor/syntax.c
View File

@ -446,6 +446,16 @@ apply_rules_going_right (WEdit * edit, off_t i)
k->whole_word_chars_right, k->line_start);
if (e > 0)
{
/* when both context and keyword terminate with a newline,
the context overflows to the next line and colorizes it incorrectly */
if (_rule._context != 0 && k->keyword[strlen (k->keyword) - 1] == '\n')
{
r = CONTEXT_RULE (g_ptr_array_index (edit->rules, _rule._context));
if (r->right != NULL && r->right[0] != '\0'
&& r->right[strlen (r->right) - 1] == '\n' && e > i + 1)
e--;
}
end = e;
_rule.end = e;
_rule.keyword = count;