Mercurial > vim
changeset 18744:b29d8a06e72c v8.1.2362
patch 8.1.2362: cannot place signs in a popup window
Commit: https://github.com/vim/vim/commit/7257073043252c2e01c8e168e6842a1121797243
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 30 14:21:53 2019 +0100
patch 8.1.2362: cannot place signs in a popup window
Problem: Cannot place signs in a popup window. (Maxim Kim)
Solution: Use the group prefix "PopUp" to specify which signs should show up
in a popup window. (closes #5277)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 30 Nov 2019 14:30:05 +0100 |
| parents | 06e8fc69df42 |
| children | 9752ce174299 |
| files | runtime/doc/sign.txt src/popupwin.c src/sign.c src/testdir/dumps/Test_popupwin_sign_1.dump src/version.c |
| diffstat | 5 files changed, 34 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -73,6 +73,10 @@ other plugins using signs. The group name "popupmenu" is used by popup windows where 'cursorline' is set. +To place a sign in a popup window the group name must start with "PopUp". +Other signs will not show in a popup window. The group name "PopUpMenu" is +used by popup windows where 'cursorline' is set. + *sign-priority* Each placed sign is assigned a priority value. When multiple signs are placed on the same line, the attributes of the sign with the highest priority is used
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -611,7 +611,7 @@ popup_highlight_curline(win_T *wp) int sign_id = 0; char_u *sign_name = popup_get_sign_name(wp); - buf_delete_signs(wp->w_buffer, (char_u *)"popupmenu"); + buf_delete_signs(wp->w_buffer, (char_u *)"PopUpMenu"); if ((wp->w_popup_flags & POPF_CURSORLINE) != 0) { @@ -626,7 +626,7 @@ popup_highlight_curline(win_T *wp) sign_define_by_name(sign_name, NULL, (char_u *)linehl, NULL, NULL); } - sign_place(&sign_id, (char_u *)"popupmenu", sign_name, + sign_place(&sign_id, (char_u *)"PopUpMenu", sign_name, wp->w_buffer, wp->w_cursor.lnum, SIGN_DEF_PRIO); redraw_win_later(wp, NOT_VALID); }
--- a/src/sign.c +++ b/src/sign.c @@ -138,7 +138,20 @@ sign_in_group(sign_entry_T *sign, char_u return ((group != NULL && STRCMP(group, "*") == 0) || (group == NULL && sign->se_group == NULL) || (group != NULL && sign->se_group != NULL - && STRCMP(group, sign->se_group->sg_name) == 0)); + && STRCMP(group, sign->se_group->sg_name) == 0)); +} + +/* + * Return TRUE if "sign" is to be displayed in window "wp". + * If the group name starts with "PopUp" it only shows in a popup window. + */ + static int +sign_group_for_window(sign_entry_T *sign, win_T *wp) +{ + int for_popup = sign->se_group != NULL + && STRNCMP("PopUp", sign->se_group->sg_name, 5) == 0; + + return WIN_IS_POPUP(wp) ? for_popup : !for_popup; } /* @@ -484,8 +497,7 @@ buf_get_signattrs(win_T *wp, linenr_T ln if (sign->se_lnum == lnum # ifdef FEAT_TEXT_PROP - && sign_in_group(sign, (char_u *)"popupmenu") - == (WIN_IS_POPUP(wp) ? TRUE : FALSE) + && sign_group_for_window(sign, wp) # endif ) { @@ -2645,8 +2657,7 @@ get_first_valid_sign(win_T *wp) sign_entry_T *sign = wp->w_buffer->b_signlist; # ifdef FEAT_TEXT_PROP - while (sign != NULL && sign_in_group(sign, (char_u *)"popupmenu") - == (WIN_IS_POPUP(wp) ? FALSE : TRUE)) + while (sign != NULL && !sign_group_for_window(sign, wp)) sign = sign->se_next; # endif return sign;
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_sign_1.dump @@ -0,0 +1,10 @@ +|>+0#e000002#ffffff0@1>0+0#ffffff16#ff404010| @71 +| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0| @71 +| +0#0000e05#a8a8a8255@1|2+0#0000000#ffffff0| @71 +| +0#0000e05#a8a8a8255@1|3+0#0000000#ffffff0| @23|#+0#ffffff16#ff404010|!|h+0#0000001#ffff4012|e|l@1|o| @12| +0#0000000#ffffff0@27 +| +0#0000e05#a8a8a8255@1|4+0#0000000#ffffff0| @23| +0#0000e05#a8a8a8255@1|b+0#0000001#ffd7ff255|r|i|g|h|t| @11| +0#0000000#ffffff0@27 +| +0#0000e05#a8a8a8255@1|5+0#0000000#ffffff0| @23| +0#0000e05#a8a8a8255@1|w+0#0000001#ffd7ff255|o|r|l|d| @12| +0#0000000#ffffff0@27 +| +0#0000e05#a8a8a8255@1|6+0#0000000#ffffff0| @71 +| +0#0000e05#a8a8a8255@1|7+0#0000000#ffffff0| @71 +| +0#0000e05#a8a8a8255@1|8+0#0000000#ffffff0| @71 +@57|1|,|1| @10|T|o|p|