patch 8.1.1902: cannot have an info popup without a border

Problem:    Cannot have an info popup without a border.
Solution:   Add the "border" item to 'completepopup'.

diff --git a/src/popupmnu.c b/src/popupmnu.c
index 929ab06721d39445c54444da60ce608779455a93..f82683ca4767b6163726794824686928a297da9e 100644 (file)
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -745,6 +745,7 @@ pum_set_selected(int n, int repeat)
                if (use_popup)
                {
                    int col = pum_col + pum_width + 1;
+                   int row = pum_row + pum_selected - pum_first + 1;
 
                    if (Columns - col < 20 && Columns - col < pum_col)
                    {
@@ -755,8 +756,8 @@ pum_set_selected(int n, int repeat)
                    else
                        curwin->w_maxwidth = Columns - col + 1;
                    curwin->w_maxwidth -= popup_extra_width(curwin);
-                   popup_set_wantpos_rowcol(curwin,
-                                     pum_row + pum_selected - pum_first, col);
+                   row -= popup_top_extra(curwin);
+                   popup_set_wantpos_rowcol(curwin, row, col);
                }
 # endif
                if (!resized

diff --git a/src/popupwin.c b/src/popupwin.c
index 99a40afd123d8f6a65c266e1abeb13afdc7a3ba2..a803faac105daace856dddd32bec648f0ba27948 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -935,7 +935,7 @@ add_popup_dicts(buf_T *buf, list_T *l)
 /*
  * Get the padding plus border at the top, adjusted to 1 if there is a title.
  */
-    static int
+    int
 popup_top_extra(win_T *wp)
 {
     int        extra = wp->w_popup_border[0] + wp->w_popup_padding[0];
@@ -1350,6 +1350,24 @@ parse_popup_option(win_T *wp, int is_preview)
                *p = c;
            }
        }
+       else if (STRNCMP(s, "border:", 7) == 0)
+       {
+           char_u      *arg = s + 7;
+           int         on = STRNCMP(arg, "on", 2) == 0 && arg + 2 == p;
+           int         off = STRNCMP(arg, "off", 3) == 0 && arg + 3 == p;
+           int         i;
+
+           if (!on && !off)
+               return FAIL;
+           if (wp != NULL)
+           {
+               for (i = 0; i < 4; ++i)
+                   wp->w_popup_border[i] = on ? 1 : 0;
+               if (off)
+                   // only show the X for close when there is a border
+                   wp->w_popup_close = POPCLOSE_NONE;
+           }
+       }
        else
            return FAIL;
     }

diff --git a/src/proto/popupwin.pro b/src/proto/popupwin.pro
index f3204439ddbfc97177235fd88331734fbd462b0c..9f6d4339ebfe8b68d128c1dddc8843f89fa9259a 100644 (file)
--- a/src/proto/popupwin.pro
+++ b/src/proto/popupwin.pro
@@ -6,6 +6,7 @@ void popup_drag(win_T *wp);
 void popup_set_firstline(win_T *wp);
 int popup_is_in_scrollbar(win_T *wp, int row, int col);
 void popup_handle_scrollbar_click(win_T *wp, int row, int col);
+int popup_top_extra(win_T *wp);
 int popup_height(win_T *wp);
 int popup_width(win_T *wp);
 int popup_extra_width(win_T *wp);

diff --git a/src/testdir/dumps/Test_popupwin_infopopup_nb_1.dump b/src/testdir/dumps/Test_popupwin_infopopup_nb_1.dump
new file mode 100644 (file)
index 0000000..41208ee
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_infopopup_nb_1.dump
@@ -0,0 +1,14 @@
+|t+0&#ffffff0|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| |t|a|w|o|r|d> @43
+|~+0#4040ff13&| @23| +0#0000001#e0e0e08|w|r|d| @4|W| |e|x|t|r|a| |t|e|x|t| @1|w|o|r|d|s| |a|r|e| |c|o@1|l| | +0#4040ff13#ffffff0@11
+|~| @23| +0#0000001#ffd7ff255|a|n|o|t|w|r|d| |W| |e|x|t|r|a| |t|e|x|t| | +0#4040ff13#ffffff0@27
+|~| @23| +0#0000001#ffd7ff255|n|o|a|w|r|d| @1|W| |e|x|t|r|a| |t|e|x|t| | +0#4040ff13#ffffff0@27
+|~| @23| +0#0000001#ffd7ff255|t|h|a|t|w|r|d| |W| |e|x|t|r|a| |t|e|x|t| | +0#4040ff13#ffffff0@27
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|-+2#0000000&@1| |U|s|e|r| |d|e|f|i|n|e|d| |c|o|m|p|l|e|t|i|o|n| |(|^|U|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |4| +0#0000000&@26

diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 3c182ea74b5e033a1b3725d02c4c803462346485..a8eca747dabc9990da77f19eb5cc4a427e3b8cd9 100644 (file)
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -78,7 +78,7 @@ let test_values = {
       \ 'complete': [['', 'w,b'], ['xxx']],
       \ 'concealcursor': [['', 'n', 'nvic'], ['xxx']],
       \ 'completeopt': [['', 'menu', 'menu,longest'], ['xxx', 'menu,,,longest,']],
-      \ 'completepopup': [['', 'height:13', 'highlight:That', 'width:10,height:234,highlight:Mine'], ['height:yes', 'width:no', 'xxx', 'xxx:99']],
+      \ 'completepopup': [['', 'height:13', 'highlight:That', 'width:10,height:234,highlight:Mine'], ['height:yes', 'width:no', 'xxx', 'xxx:99', 'border:maybe', 'border:1']],
       \ 'completeslash': [['', 'slash', 'backslash'], ['xxx']],
       \ 'cryptmethod': [['', 'zip'], ['xxx']],
       \ 'cscopequickfix': [['', 's-', 's-,c+,e0'], ['xxx', 's,g,d']],

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 15a61f962c8011d46a69a21a737f614a2834609a..98522b792f94af6c7b8a6c3ac30ae371bda33e2d 100644 (file)
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2193,14 +2193,11 @@ func Test_previewpopup()
   call delete('Xheader.h')
 endfunc
 
-func Test_popupmenu_info()
-  CheckScreendump
-
+func Get_popupmenu_lines()
   let lines =<< trim END
       set completeopt+=preview,popup
       set completefunc=CompleteFuncDict
       hi InfoPopup ctermbg=yellow
-      set completepopup=height:4,highlight:InfoPopup
 
       func CompleteFuncDict(findstart, base)
        if a:findstart
@@ -2249,7 +2246,16 @@ func Test_popupmenu_info()
       endfunc
       call setline(1, 'text text text text text text text ')
   END
+  return lines
+endfunc
+
+func Test_popupmenu_info_border()
+  CheckScreendump
+
+  let lines = Get_popupmenu_lines()
+  call add(lines, 'set completepopup=height:4,highlight:InfoPopup')
   call writefile(lines, 'XtestInfoPopup')
+
   let buf = RunVimInTerminal('-S XtestInfoPopup', #{rows: 14})
   call term_wait(buf, 50)
 
@@ -2269,4 +2275,21 @@ func Test_popupmenu_info()
   call delete('XtestInfoPopup')
 endfunc
 
+func Test_popupmenu_info_noborder()
+  CheckScreendump
+
+  let lines = Get_popupmenu_lines()
+  call add(lines, 'set completepopup=height:4,border:off')
+  call writefile(lines, 'XtestInfoPopupNb')
+
+  let buf = RunVimInTerminal('-S XtestInfoPopupNb', #{rows: 14})
+  call term_wait(buf, 50)
+
+  call term_sendkeys(buf, "A\<C-X>\<C-U>")
+  call VerifyScreenDump(buf, 'Test_popupwin_infopopup_nb_1', {})
+
+  call StopVimInTerminal(buf)
+  call delete('XtestInfoPopupNb')
+endfunc
+
 " vim: shiftwidth=2 sts=2

diff --git a/src/version.c b/src/version.c
index b23da408923f3631fb37fdb6565d21d76b398cbe..0b15d716099fe27fc8f7cf7c18f2e81c0f39ccd3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1902,
 /**/
     1901,
 /**/