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

lint

Browse Source
This commit is contained in:
Jan Edmund Lazo
2018-11-18 00:30:16 -05:00
parent 65a3d53cb9
commit f4b4b7c132
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/nvim/screen.c
View File

@@ -2169,21 +2169,21 @@ win_line (
static linenr_T checked_lnum = 0; /* line number for "checked_col" */ static linenr_T checked_lnum = 0; /* line number for "checked_col" */
static int checked_col = 0; /* column in "checked_lnum" up to which static int checked_col = 0; /* column in "checked_lnum" up to which
* there are no spell errors */ * there are no spell errors */
static int cap_col = -1; /* column to check for Cap word */ static int cap_col = -1; // column to check for Cap word
static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ static linenr_T capcol_lnum = 0; // line number where "cap_col"
int cur_checked_col = 0; /* checked column for current line */ int cur_checked_col = 0; // checked column for current line
int extra_check = 0; // has syntax or linebreak int extra_check = 0; // has syntax or linebreak
int multi_attr = 0; /* attributes desired by multibyte */ int multi_attr = 0; // attributes desired by multibyte
int mb_l = 1; /* multi-byte byte length */ int mb_l = 1; // multi-byte byte length
int mb_c = 0; /* decoded multi-byte character */ int mb_c = 0; // decoded multi-byte character
int mb_utf8 = FALSE; /* screen char is UTF-8 char */ bool mb_utf8 = false; // screen char is UTF-8 char
int u8cc[MAX_MCO]; /* composing UTF-8 chars */ int u8cc[MAX_MCO]; // composing UTF-8 chars
int filler_lines; /* nr of filler lines to be drawn */ int filler_lines; // nr of filler lines to be drawn
int filler_todo; /* nr of filler lines still to do + 1 */ int filler_todo; // nr of filler lines still to do + 1
hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ hlf_T diff_hlf = (hlf_T)0; // type of diff highlighting
int change_start = MAXCOL; /* first col of changed area */ int change_start = MAXCOL; // first col of changed area
int change_end = -1; /* last col of changed area */ int change_end = -1; // last col of changed area
colnr_T trailcol = MAXCOL; /* start of trailing spaces */ colnr_T trailcol = MAXCOL; // start of trailing spaces
int need_showbreak = false; // overlong line, skip first x chars int need_showbreak = false; // overlong line, skip first x chars
int line_attr = 0; // attribute for the whole line int line_attr = 0; // attribute for the whole line
int line_attr_lowprio = 0; // low-priority attribute for the line int line_attr_lowprio = 0; // low-priority attribute for the line
@@ -3100,8 +3100,9 @@ win_line (
mb_utf8 = true; mb_utf8 = true;
u8cc[0] = 0; u8cc[0] = 0;
c = 0xc0; c = 0xc0;
} else } else {
mb_utf8 = FALSE; mb_utf8 = false;
}
} else { } else {
c = *p_extra; c = *p_extra;
if (has_mbyte) { if (has_mbyte) {
@@ -3272,7 +3273,7 @@ win_line (
&& (*mb_char2cells)(mb_c) == 2) { && (*mb_char2cells)(mb_c) == 2) {
c = '>'; c = '>';
mb_c = c; mb_c = c;
mb_utf8 = FALSE; mb_utf8 = false;
mb_l = 1; mb_l = 1;
multi_attr = win_hl_attr(wp, HLF_AT); multi_attr = win_hl_attr(wp, HLF_AT);
// Put pointer back so that the character will be // Put pointer back so that the character will be
@@ -3295,7 +3296,7 @@ win_line (
saved_attr2 = char_attr; // save current attr saved_attr2 = char_attr; // save current attr
} }
mb_c = c; mb_c = c;
mb_utf8 = FALSE; mb_utf8 = false;
mb_l = 1; mb_l = 1;
} }
@@ -3573,7 +3574,7 @@ win_line (
} }
} }
mb_utf8 = (int)false; // don't draw as UTF-8 mb_utf8 = false; // don't draw as UTF-8
if (wp->w_p_list) { if (wp->w_p_list) {
c = lcs_tab1; c = lcs_tab1;
if (wp->w_p_lbr) { if (wp->w_p_lbr) {
@@ -3636,8 +3637,9 @@ win_line (
mb_utf8 = true; mb_utf8 = true;
u8cc[0] = 0; u8cc[0] = 0;
c = 0xc0; c = 0xc0;
} else } else {
mb_utf8 = FALSE; /* don't draw as UTF-8 */ mb_utf8 = false; // don't draw as UTF-8
}
} else if (c != NUL) { } else if (c != NUL) {
p_extra = transchar(c); p_extra = transchar(c);
if (n_extra == 0) { if (n_extra == 0) {
@@ -3726,8 +3728,9 @@ win_line (
mb_utf8 = true; mb_utf8 = true;
u8cc[0] = 0; u8cc[0] = 0;
c = 0xc0; c = 0xc0;
} else } else {
mb_utf8 = FALSE; /* don't draw as UTF-8 */ mb_utf8 = false; // don't draw as UTF-8
}
} else { } else {
prev_syntax_id = 0; prev_syntax_id = 0;
is_concealing = FALSE; is_concealing = FALSE;
@@ -4053,8 +4056,9 @@ win_line (
mb_utf8 = true; mb_utf8 = true;
u8cc[0] = 0; u8cc[0] = 0;
c = 0xc0; c = 0xc0;
} else } else {
mb_utf8 = FALSE; mb_utf8 = false;
}
} }
/* advance to the next 'colorcolumn' */ /* advance to the next 'colorcolumn' */