IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Justin M. Keyes 2017-04-28 05:27:47 +02:00
parent 2b6a3819e5
commit 0ddebbc354
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/nvim/buffer.c
View File

@ -3256,12 +3256,13 @@ int build_stl_str_hl(
// { Move the truncated output // { Move the truncated output
memmove(t + 1, t + n, (size_t)(out_p - (t + n))); memmove(t + 1, t + n, (size_t)(out_p - (t + n)));
out_p = out_p - n + 1; out_p = out_p - n + 1;
/* Fill up space left over by half a double-wide char. */ // Fill up space left over by half a double-wide char.
while (++group_len < items[groupitems[groupdepth]].minwid) while (++group_len < items[groupitems[groupdepth]].minwid) {
*out_p++ = fillchar; *out_p++ = fillchar;
}
// } // }
/* correct the start of the items for the truncation */ // correct the start of the items for the truncation
for (int idx = groupitems[groupdepth] + 1; idx < curitem; idx++) { for (int idx = groupitems[groupdepth] + 1; idx < curitem; idx++) {
// Shift everything back by the number of removed bytes // Shift everything back by the number of removed bytes
items[idx].start -= n; items[idx].start -= n;
@ -3366,16 +3367,17 @@ int build_stl_str_hl(
if (*fmt_p == STL_TABPAGENR || *fmt_p == STL_TABCLOSENR) { if (*fmt_p == STL_TABPAGENR || *fmt_p == STL_TABCLOSENR) {
if (*fmt_p == STL_TABCLOSENR) { if (*fmt_p == STL_TABCLOSENR) {
if (minwid == 0) { if (minwid == 0) {
/* %X ends the close label, go back to the previously // %X ends the close label, go back to the previous tab label nr.
* define tab label nr. */ for (long n = curitem - 1; n >= 0; n--) {
for (long n = curitem - 1; n >= 0; --n)
if (items[n].type == TabPage && items[n].minwid >= 0) { if (items[n].type == TabPage && items[n].minwid >= 0) {
minwid = items[n].minwid; minwid = items[n].minwid;
break; break;
} }
} else }
/* close nrs are stored as negative values */ } else {
// close nrs are stored as negative values
minwid = -minwid; minwid = -minwid;
}
} }
items[curitem].type = TabPage; items[curitem].type = TabPage;
items[curitem].start = out_p; items[curitem].start = out_p;
@ -3396,7 +3398,7 @@ int build_stl_str_hl(
} }
items[curitem].type = ClickFunc; items[curitem].type = ClickFunc;
items[curitem].start = out_p; items[curitem].start = out_p;
items[curitem].cmd = xmemdupz(t, (size_t) (((char *) fmt_p - t))); items[curitem].cmd = xmemdupz(t, (size_t)(((char *)fmt_p - t)));
items[curitem].minwid = minwid; items[curitem].minwid = minwid;
fmt_p++; fmt_p++;
curitem++; curitem++;
@ -3917,13 +3919,14 @@ int build_stl_str_hl(
trunc_p = items[0].start; trunc_p = items[0].start;
item_idx = 0; item_idx = 0;
for (int i = 0; i < itemcnt; i++) for (int i = 0; i < itemcnt; i++) {
if (items[i].type == Trunc) { if (items[i].type == Trunc) {
// Truncate at %< items. // Truncate at %< items.
trunc_p = items[i].start; trunc_p = items[i].start;
item_idx = i; item_idx = i;
break; break;
} }
}
} }
// If the truncation point we found is beyond the maximum // If the truncation point we found is beyond the maximum
@ -4052,11 +4055,11 @@ int build_stl_str_hl(
standard_spaces * (num_separators - 1); standard_spaces * (num_separators - 1);
for (int i = 0; i < num_separators; i++) { for (int i = 0; i < num_separators; i++) {
int dislocation = (i == (num_separators - 1)) ? int dislocation = (i == (num_separators - 1))
final_spaces : standard_spaces; ? final_spaces : standard_spaces;
char_u *sep_loc = items[separator_locations[i]].start + dislocation; char_u *seploc = items[separator_locations[i]].start + dislocation;
STRMOVE(sep_loc, items[separator_locations[i]].start); STRMOVE(seploc, items[separator_locations[i]].start);
for (char_u *s = items[separator_locations[i]].start; s < sep_loc; s++) { for (char_u *s = items[separator_locations[i]].start; s < seploc; s++) {
*s = fillchar; *s = fillchar;
} }
@ -4090,7 +4093,7 @@ int build_stl_str_hl(
StlClickRecord *cur_tab_rec = tabtab; StlClickRecord *cur_tab_rec = tabtab;
for (long l = 0; l < itemcnt; l++) { for (long l = 0; l < itemcnt; l++) {
if (items[l].type == TabPage) { if (items[l].type == TabPage) {
cur_tab_rec->start = (char *) items[l].start; cur_tab_rec->start = (char *)items[l].start;
if (items[l].minwid == 0) { if (items[l].minwid == 0) {
cur_tab_rec->def.type = kStlClickDisabled; cur_tab_rec->def.type = kStlClickDisabled;
cur_tab_rec->def.tabnr = 0; cur_tab_rec->def.tabnr = 0;
@ -4107,7 +4110,7 @@ int build_stl_str_hl(
cur_tab_rec->def.func = NULL; cur_tab_rec->def.func = NULL;
cur_tab_rec++; cur_tab_rec++;
} else if (items[l].type == ClickFunc) { } else if (items[l].type == ClickFunc) {
cur_tab_rec->start = (char *) items[l].start; cur_tab_rec->start = (char *)items[l].start;
cur_tab_rec->def.type = kStlClickFuncRun; cur_tab_rec->def.type = kStlClickFuncRun;
cur_tab_rec->def.tabnr = items[l].minwid; cur_tab_rec->def.tabnr = items[l].minwid;
cur_tab_rec->def.func = items[l].cmd; cur_tab_rec->def.func = items[l].cmd;