Merge pull request #13137 from erw7/fix-pum-pos

Fix popupmenu position issue

2 files changed, 57 insertions, 57 deletions

diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 3beada5bc9..9cdb2d1404 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -301,49 +301,49 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
         if (pum_width < p_pw) {
           pum_width = (int)p_pw;
         }
-      }
-    } else if (((cursor_col > p_pw || cursor_col > max_width) && !pum_rl)
-               || (pum_rl && (cursor_col < Columns - p_pw
-                              || cursor_col < Columns - max_width))) {
-      // align pum edge with "cursor_col"
-      if (pum_rl && W_ENDCOL(curwin) < max_width + pum_scrollbar + 1) {
-        pum_col = cursor_col + max_width + pum_scrollbar + 1;
-        if (pum_col >= Columns) {
-          pum_col = Columns - 1;
-        }
-      } else if (!pum_rl) {
-        if (curwin->w_wincol > Columns - max_width - pum_scrollbar
-            && max_width <= p_pw) {
-          // use full width to end of the screen
-          pum_col = cursor_col - max_width - pum_scrollbar;
-          if (pum_col < 0) {
-            pum_col = 0;
+      } else if (((cursor_col > p_pw || cursor_col > max_width) && !pum_rl)
+                 || (pum_rl && (cursor_col < Columns - p_pw
+                                || cursor_col < Columns - max_width))) {
+        // align pum edge with "cursor_col"
+        if (pum_rl && W_ENDCOL(curwin) < max_width + pum_scrollbar + 1) {
+          pum_col = cursor_col + max_width + pum_scrollbar + 1;
+          if (pum_col >= Columns) {
+            pum_col = Columns - 1;
+          }
+        } else if (!pum_rl) {
+          if (curwin->w_wincol > Columns - max_width - pum_scrollbar
+              && max_width <= p_pw) {
+            // use full width to end of the screen
+            pum_col = Columns - max_width - pum_scrollbar;
+            if (pum_col < 0) {
+              pum_col = 0;
+            }
           }
         }
-      }
-
-      if (pum_rl) {
-        pum_width = pum_col - pum_scrollbar + 1;
-      } else {
-        pum_width = Columns - pum_col - pum_scrollbar;
-      }
 
-      if (pum_width < p_pw) {
-        pum_width = (int)p_pw;
         if (pum_rl) {
-          if (pum_width > pum_col) {
-            pum_width = pum_col;
-          }
+          pum_width = pum_col - pum_scrollbar + 1;
         } else {
-          if (pum_width >= Columns - pum_col) {
-            pum_width = Columns - pum_col - 1;
-          }
+          pum_width = Columns - pum_col - pum_scrollbar;
         }
-      } else if (pum_width > max_width + pum_kind_width + pum_extra_width + 1
-                 && pum_width > p_pw) {
-        pum_width = max_width + pum_kind_width + pum_extra_width + 1;
+
         if (pum_width < p_pw) {
           pum_width = (int)p_pw;
+          if (pum_rl) {
+            if (pum_width > pum_col) {
+              pum_width = pum_col;
+            }
+          } else {
+            if (pum_width >= Columns - pum_col) {
+              pum_width = Columns - pum_col - 1;
+            }
+          }
+        } else if (pum_width > max_width + pum_kind_width + pum_extra_width + 1
+                   && pum_width > p_pw) {
+          pum_width = max_width + pum_kind_width + pum_extra_width + 1;
+          if (pum_width < p_pw) {
+            pum_width = (int)p_pw;
+          }
         }
       }
     } else if (Columns < def_width) {
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index c1c5d1ce2e..3f984ff943 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -1213,10 +1213,10 @@ describe('builtin popupmenu', function()
     funcs.complete(29, {'word', 'choice', 'text', 'thing'})
     screen:expect([[
       some long prefix before the ^    |
-      {n:word           }{1:                 }|
-      {n:choice         }{1:                 }|
-      {n:text           }{1:                 }|
-      {n:thing          }{1:                 }|
+      {1:~                        }{n: word  }|
+      {1:~                        }{n: choice}|
+      {1:~                        }{n: text  }|
+      {1:~                        }{n: thing }|
       {1:~                               }|
       {1:~                               }|
       {1:~                               }|
@@ -1261,10 +1261,10 @@ describe('builtin popupmenu', function()
     feed('<c-p>')
     screen:expect([[
       some long prefix before the text|
-      {n:^word           }{1:                 }|
-      {n:choice         }{1:                 }|
-      {s:text           }{1:                 }|
-      {n:thing          }{1:                 }|
+      {1:^~                        }{n: word  }|
+      {1:~                        }{n: choice}|
+      {1:~                        }{s: text  }|
+      {1:~                        }{n: thing }|
       {1:~                               }|
       {1:~                               }|
       {1:~                               }|
@@ -1341,10 +1341,10 @@ describe('builtin popupmenu', function()
     screen:expect([[
       some long prefix    |
       before the text^     |
-      {1:~         }{n: word     }|
-      {1:~         }{n: choice   }|
-      {1:~         }{s: text     }|
-      {1:~         }{n: thing    }|
+      {1:~         }{n: word    }{1: }|
+      {1:~         }{n: choice  }{1: }|
+      {1:~         }{s: text    }{1: }|
+      {1:~         }{n: thing   }{1: }|
       {1:~                   }|
       {2:-- INSERT --}        |
     ]])
@@ -1358,10 +1358,10 @@ describe('builtin popupmenu', function()
     funcs.complete(29, {'word', 'choice', 'text', 'thing'})
     screen:expect([[
       some long prefix before the ^    |
-      {n:word           }{1:                 }|
-      {n:choice         }{1:                 }|
-      {n:text           }{1:                 }|
-      {n:thing          }{1:                 }|
+      {1:~                        }{n: word  }|
+      {1:~                        }{n: choice}|
+      {1:~                        }{n: text  }|
+      {1:~                        }{n: thing }|
       {1:~                               }|
       {1:~                               }|
       {1:~                               }|
@@ -2168,8 +2168,8 @@ describe('builtin popupmenu', function()
     funcs.complete(29, {'word', 'choice', 'text', 'thing'})
     screen:expect([[
       some long prefix before the ^    |
-      {n:word           }{c: }{1:                }|
-      {n:choice         }{s: }{1:                }|
+      {1:~                       }{n: word  }{c: }|
+      {1:~                       }{n: choice}{s: }|
       {1:~                               }|
       {1:~                               }|
       {1:~                               }|
@@ -2187,10 +2187,10 @@ describe('builtin popupmenu', function()
     funcs.complete(29, {'word', 'choice', 'text', 'thing'})
     screen:expect([[
       some long prefix before the ^    |
-      {n:word    }{1:                        }|
-      {n:choice  }{1:                        }|
-      {n:text    }{1:                        }|
-      {n:thing   }{1:                        }|
+      {1:~                        }{n: word  }|
+      {1:~                        }{n: choice}|
+      {1:~                        }{n: text  }|
+      {1:~                        }{n: thing }|
       {1:~                               }|
       {1:~                               }|
       {2:-- INSERT --}                    |