diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-02-03 22:17:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 22:17:28 +0100 |
| commit | da88278f2786d85565e6e2a163709266e4c46232 (patch) | |
| tree | ac64b16602015def0982ea9a5da9e34bcfb04576 | |
| parent | 08155e2b53cdb0e2af72f347d9bb464ea0edab5e (diff) | |
| parent | 81ac8e9015142fb539ad888651130f6a0ab0b27a (diff) | |
| download | rneovim-da88278f2786d85565e6e2a163709266e4c46232.tar.gz rneovim-da88278f2786d85565e6e2a163709266e4c46232.tar.bz2 rneovim-da88278f2786d85565e6e2a163709266e4c46232.zip | |
Merge pull request #9579 from bfredl/pum_fix
popupmenu: fix alignment of kind and extra after #9530
| -rw-r--r-- | src/nvim/popupmnu.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/popupmenu_spec.lua | 51 |
2 files changed, 52 insertions, 1 deletions
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 40f62b437c..9b09006b5f 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -517,7 +517,7 @@ void pum_redraw(void) } else { grid_fill(&pum_grid, row, row + 1, col, col_off + pum_base_width + n, ' ', ' ', attr); - col = pum_base_width + n; + col = col_off + pum_base_width + n; } totwidth = pum_base_width + n; } diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua index 9e6a61f4d0..6a10f60ad8 100644 --- a/test/functional/ui/popupmenu_spec.lua +++ b/test/functional/ui/popupmenu_spec.lua @@ -1178,5 +1178,56 @@ describe('builtin popupmenu', function() ]]) end) + it('works with kind, menu and abbr attributes', function() + screen:try_resize(40,8) + feed('ixx ') + funcs.complete(4, {{word='wordey', kind= 'x', menu='extrainfo'}, 'thing', {word='secret', abbr='sneaky', menu='bar'}}) + screen:expect([[ + xx wordey^ | + {1:~ }{s: wordey x extrainfo }{1: }| + {1:~ }{n: thing }{1: }| + {1:~ }{n: sneaky bar }{1: }| + {1:~ }| + {1:~ }| + {1:~ }| + {2:-- INSERT --} | + ]]) + + feed('<c-p>') + screen:expect([[ + xx ^ | + {1:~ }{n: wordey x extrainfo }{1: }| + {1:~ }{n: thing }{1: }| + {1:~ }{n: sneaky bar }{1: }| + {1:~ }| + {1:~ }| + {1:~ }| + {2:-- INSERT --} | + ]]) + + feed('<c-p>') + screen:expect([[ + xx secret^ | + {1:~ }{n: wordey x extrainfo }{1: }| + {1:~ }{n: thing }{1: }| + {1:~ }{s: sneaky bar }{1: }| + {1:~ }| + {1:~ }| + {1:~ }| + {2:-- INSERT --} | + ]]) + + feed('<esc>') + screen:expect([[ + xx secre^t | + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + | + ]]) + end) end) |