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

vim-patch:8.1.0709: windows are updated for every added/deleted sign

Browse Source 
Problem:    Windows are updated for every added/deleted sign.
Solution:   Do not call update_debug_sign().  Only redraw when the line with
            the sign is visible.  (idea from neovim vim/vim#9479)
27a472c32e
This commit is contained in:
Andrej Zieger 2019-05-20 11:19:22 +02:00
parent f43900f686
commit e09f3baed8
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/screen.c
View File

@ -221,7 +221,8 @@ void redraw_buf_later(buf_T *buf, int type)
void redraw_buf_line_later(buf_T *buf, linenr_T line) void redraw_buf_line_later(buf_T *buf, linenr_T line)
{ {
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_buffer == buf) { if (wp->w_buffer == buf
&& line >= wp->w_topline && line < wp->w_botline) {
redrawWinline(wp, line); redrawWinline(wp, line);
} }
} }

35
src/nvim/sign.c
View File

@ -326,8 +326,8 @@ void buf_addsign(
prev = NULL; prev = NULL;
FOR_ALL_SIGNS_IN_BUF(buf, sign) { FOR_ALL_SIGNS_IN_BUF(buf, sign) {
if (lnum == sign->lnum && id == sign->id && if (lnum == sign->lnum && id == sign->id
sign_in_group(sign, groupname)) { && sign_in_group(sign, groupname)) {
// Update an existing sign // Update an existing sign
sign->typenr = typenr; sign->typenr = typenr;
return; return;
@ -453,9 +453,9 @@ linenr_T buf_delsign(
lnum = 0; lnum = 0;
for (sign = buf->b_signlist; sign != NULL; sign = next) { for (sign = buf->b_signlist; sign != NULL; sign = next) {
next = sign->next; next = sign->next;
if ((id == 0 || sign->id == id) && if ((id == 0 || sign->id == id)
(atlnum == 0 || sign->lnum == atlnum) && && (atlnum == 0 || sign->lnum == atlnum)
sign_in_group(sign, group)) { && sign_in_group(sign, group)) {
*lastp = next; *lastp = next;
if (next != NULL) { if (next != NULL) {
next->prev = sign->prev; next->prev = sign->prev;
@ -564,7 +564,6 @@ void buf_delete_signs(buf_T *buf, char_u *group)
// When deleting the last sign need to redraw the windows to remove the // When deleting the last sign need to redraw the windows to remove the
// sign column. Not when curwin is NULL (this means we're exiting). // sign column. Not when curwin is NULL (this means we're exiting).
if (buf->b_signlist != NULL && curwin != NULL){ if (buf->b_signlist != NULL && curwin != NULL){
redraw_buf_later(buf, NOT_VALID);
changed_cline_bef_curs(); changed_cline_bef_curs();
} }
@ -1047,16 +1046,16 @@ static void sign_place_cmd(
// :sign place // :sign place
// :sign place group={group} // :sign place group={group}
// :sign place group=* // :sign place group=*
if (lnum >= 0 || sign_name != NULL || if (lnum >= 0 || sign_name != NULL
(group != NULL && *group == '\0')) { || (group != NULL && *group == '\0')) {
EMSG(_(e_invarg)); EMSG(_(e_invarg));
} else { } else {
sign_list_placed(buf, group); sign_list_placed(buf, group);
} }
} else { } else {
// Place a new sign // Place a new sign
if (sign_name == NULL || buf == NULL || if (sign_name == NULL || buf == NULL
(group != NULL && *group == '\0')) { || (group != NULL && *group == '\0')) {
EMSG(_(e_invarg)); EMSG(_(e_invarg));
return; return;
} }
@ -1148,8 +1147,8 @@ static void sign_jump_cmd(
return; return;
} }
if (buf == NULL || (group != NULL && *group == '\0') || if (buf == NULL || (group != NULL && *group == '\0')
lnum >= 0 || sign_name != NULL) { || lnum >= 0 || sign_name != NULL) {
// File or buffer is not specified or an empty group is used // File or buffer is not specified or an empty group is used
// or a line number or a sign name is specified. // or a line number or a sign name is specified.
EMSG(_(e_invarg)); EMSG(_(e_invarg));
@ -1280,8 +1279,8 @@ static int parse_sign_cmd_args(
// If the filename is not supplied for the sign place or the sign jump // If the filename is not supplied for the sign place or the sign jump
// command, then use the current buffer. // command, then use the current buffer.
if (filename == NULL && ((cmd == SIGNCMD_PLACE && lnum_arg) if (filename == NULL && ((cmd == SIGNCMD_PLACE && lnum_arg)
|| cmd == SIGNCMD_JUMP)) { || cmd == SIGNCMD_JUMP)) {
*buf = curwin->w_buffer; *buf = curwin->w_buffer;
} }
return OK; return OK;
} }
@ -1477,10 +1476,10 @@ static void sign_get_placed_in_buf(
if (!sign_in_group(sign, sign_group)) { if (!sign_in_group(sign, sign_group)) {
continue; continue;
} }
if ((lnum == 0 && sign_id == 0) || if ((lnum == 0 && sign_id == 0)
(sign_id == 0 && lnum == sign->lnum) || || (sign_id == 0 && lnum == sign->lnum)
(lnum == 0 && sign_id == sign->id) || || (lnum == 0 && sign_id == sign->id)
(lnum == sign->lnum && sign_id == sign->id)) { || (lnum == sign->lnum && sign_id == sign->id)) {
if ((sdict = sign_get_info(sign)) != NULL) { if ((sdict = sign_get_info(sign)) != NULL) {
tv_list_append_dict(l, sdict); tv_list_append_dict(l, sdict);
} }