opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

popupmenu: don't use 'rightleft' option in cmdline mode 

Cmdline is always drawn from the left to right, so using rightleft
popupmenu is not useful here
This commit is contained in:
Björn Linse 2020-03-23 18:53:40 +01:00
parent 9847306b95
commit 4dabbc19d4
2 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/nvim/popupmnu.c
View File

@ -38,7 +38,8 @@ static int pum_width; // width of displayed pum items
static int pum_base_width; // width of pum items base static int pum_base_width; // width of pum items base
static int pum_kind_width; // width of pum items kind column static int pum_kind_width; // width of pum items kind column
static int pum_extra_width; // width of extra stuff static int pum_extra_width; // width of extra stuff
static int pum_scrollbar; // TRUE when scrollbar present static int pum_scrollbar; // one when scrollbar present, else zero
static bool pum_rl; // true when popupmenu is drawn 'rightleft'
static int pum_anchor_grid; // grid where position is defined static int pum_anchor_grid; // grid where position is defined
static int pum_row; // top row of pum static int pum_row; // top row of pum
@ -110,6 +111,8 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
|| (State == CMDLINE && ui_has(kUIWildmenu)); || (State == CMDLINE && ui_has(kUIWildmenu));
} }
pum_rl = (curwin->w_p_rl && State != CMDLINE);
do { do {
// Mark the pum as visible already here, // Mark the pum as visible already here,
// to avoid that must_redraw is set when 'cursorcolumn' is on. // to avoid that must_redraw is set when 'cursorcolumn' is on.
@ -127,7 +130,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
} else { } else {
// anchor position: the start of the completed word // anchor position: the start of the completed word
pum_win_row = curwin->w_wrow; pum_win_row = curwin->w_wrow;
if (curwin->w_p_rl) { if (pum_rl) {
cursor_col = curwin->w_width - curwin->w_wcol - 1; cursor_col = curwin->w_width - curwin->w_wcol - 1;
} else { } else {
cursor_col = curwin->w_wcol; cursor_col = curwin->w_wcol;
@ -270,16 +273,14 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
def_width = max_width; def_width = max_width;
} }
if ((((cursor_col < Columns - p_pw) if ((((cursor_col < Columns - p_pw) || (cursor_col < Columns - max_width))
|| (cursor_col < Columns - max_width)) && !pum_rl)
&& !curwin->w_p_rl) || (pum_rl && ((cursor_col > p_pw) || (cursor_col > max_width)))) {
|| (curwin->w_p_rl
&& ((cursor_col > p_pw) || (cursor_col > max_width)))) {
// align pum with "cursor_col" // align pum with "cursor_col"
pum_col = cursor_col; pum_col = cursor_col;
// start with the maximum space available // start with the maximum space available
if (curwin->w_p_rl) { if (pum_rl) {
pum_width = pum_col - pum_scrollbar + 1; pum_width = pum_col - pum_scrollbar + 1;
} else { } else {
assert(Columns - pum_col - pum_scrollbar >= INT_MIN assert(Columns - pum_col - pum_scrollbar >= INT_MIN
@ -297,19 +298,16 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
pum_width = (int)p_pw; pum_width = (int)p_pw;
} }
} }
} else if (((cursor_col > p_pw || cursor_col > max_width) } else if (((cursor_col > p_pw || cursor_col > max_width) && !pum_rl)
&& !curwin->w_p_rl) || (pum_rl && (cursor_col < Columns - p_pw
|| (curwin->w_p_rl || cursor_col < Columns - max_width))) {
&& (cursor_col < Columns - p_pw
|| cursor_col < Columns - max_width))) {
// align pum edge with "cursor_col" // align pum edge with "cursor_col"
if (curwin->w_p_rl if (pum_rl && W_ENDCOL(curwin) < max_width + pum_scrollbar + 1) {
&& W_ENDCOL(curwin) < max_width + pum_scrollbar + 1) {
pum_col = cursor_col + max_width + pum_scrollbar + 1; pum_col = cursor_col + max_width + pum_scrollbar + 1;
if (pum_col >= Columns) { if (pum_col >= Columns) {
pum_col = Columns - 1; pum_col = Columns - 1;
} }
} else if (!curwin->w_p_rl) { } else if (!pum_rl) {
if (curwin->w_wincol > Columns - max_width - pum_scrollbar if (curwin->w_wincol > Columns - max_width - pum_scrollbar
&& max_width <= p_pw) { && max_width <= p_pw) {
// use full width to end of the screen // use full width to end of the screen
@ -320,7 +318,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
} }
} }
if (curwin->w_p_rl) { if (pum_rl) {
pum_width = pum_col - pum_scrollbar + 1; pum_width = pum_col - pum_scrollbar + 1;
} else { } else {
pum_width = Columns - pum_col - pum_scrollbar; pum_width = Columns - pum_col - pum_scrollbar;
@ -328,7 +326,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
if (pum_width < p_pw) { if (pum_width < p_pw) {
pum_width = (int)p_pw; pum_width = (int)p_pw;
if (curwin->w_p_rl) { if (pum_rl) {
if (pum_width > pum_col) { if (pum_width > pum_col) {
pum_width = pum_col; pum_width = pum_col;
} }
@ -346,7 +344,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
} }
} else if (Columns < def_width) { } else if (Columns < def_width) {
// not enough room, will use what we have // not enough room, will use what we have
if (curwin->w_p_rl) { if (pum_rl) {
assert(Columns - 1 >= INT_MIN); assert(Columns - 1 >= INT_MIN);
pum_col = (int)(Columns - 1); pum_col = (int)(Columns - 1);
} else { } else {
@ -360,7 +358,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed,
max_width = (int)p_pw; max_width = (int)p_pw;
} }
if (curwin->w_p_rl) { if (pum_rl) {
pum_col = max_width - 1; pum_col = max_width - 1;
} else { } else {
assert(Columns - max_width >= INT_MIN assert(Columns - max_width >= INT_MIN
@ -399,7 +397,7 @@ void pum_redraw(void)
int grid_width = pum_width; int grid_width = pum_width;
int col_off = 0; int col_off = 0;
bool extra_space = false; bool extra_space = false;
if (curwin->w_p_rl) { if (pum_rl) {
col_off = pum_width; col_off = pum_width;
if (pum_col < curwin->w_wincol + curwin->w_width - 1) { if (pum_col < curwin->w_wincol + curwin->w_width - 1) {
grid_width += 1; grid_width += 1;
@ -460,7 +458,7 @@ void pum_redraw(void)
// prepend a space if there is room // prepend a space if there is room
if (extra_space) { if (extra_space) {
if (curwin->w_p_rl) { if (pum_rl) {
grid_putchar(&pum_grid, ' ', row, col_off + 1, attr); grid_putchar(&pum_grid, ' ', row, col_off + 1, attr);
} else { } else {
grid_putchar(&pum_grid, ' ', row, col_off - 1, attr); grid_putchar(&pum_grid, ' ', row, col_off - 1, attr);
@ -507,7 +505,7 @@ void pum_redraw(void)
st = (char_u *)transstr((const char *)s); st = (char_u *)transstr((const char *)s);
*p = saved; *p = saved;
if (curwin->w_p_rl) { if (pum_rl) {
char_u *rt = reverse_text(st); char_u *rt = reverse_text(st);
char_u *rt_start = rt; char_u *rt_start = rt;
int size = vim_strsize(rt); int size = vim_strsize(rt);
@ -542,7 +540,7 @@ void pum_redraw(void)
} }
// Display two spaces for a Tab. // Display two spaces for a Tab.
if (curwin->w_p_rl) { if (pum_rl) {
grid_puts_len(&pum_grid, (char_u *)" ", 2, row, col - 1, grid_puts_len(&pum_grid, (char_u *)" ", 2, row, col - 1,
attr); attr);
col -= 2; col -= 2;
@ -577,7 +575,7 @@ void pum_redraw(void)
break; break;
} }
if (curwin->w_p_rl) { if (pum_rl) {
grid_fill(&pum_grid, row, row + 1, col_off - pum_base_width - n + 1, grid_fill(&pum_grid, row, row + 1, col_off - pum_base_width - n + 1,
col + 1, ' ', ' ', attr); col + 1, ' ', ' ', attr);
col = col_off - pum_base_width - n + 1; col = col_off - pum_base_width - n + 1;
@ -589,7 +587,7 @@ void pum_redraw(void)
totwidth = pum_base_width + n; totwidth = pum_base_width + n;
} }
if (curwin->w_p_rl) { if (pum_rl) {
grid_fill(&pum_grid, row, row + 1, col_off - pum_width + 1, col + 1, grid_fill(&pum_grid, row, row + 1, col_off - pum_width + 1, col + 1,
' ', ' ', attr); ' ', ' ', attr);
} else { } else {
@ -598,7 +596,7 @@ void pum_redraw(void)
} }
if (pum_scrollbar > 0) { if (pum_scrollbar > 0) {
if (curwin->w_p_rl) { if (pum_rl) {
grid_putchar(&pum_grid, ' ', row, col_off - pum_width, grid_putchar(&pum_grid, ' ', row, col_off - pum_width,
i >= thumb_pos && i < thumb_pos + thumb_heigth i >= thumb_pos && i < thumb_pos + thumb_heigth
? attr_thumb : attr_scroll); ? attr_thumb : attr_scroll);

51
test/functional/ui/popupmenu_spec.lua
View File

@ -1338,7 +1338,7 @@ describe('builtin popupmenu', function()
end) end)
it('with rightleft window', function() it('with rightleft window', function()
command("set rl") command("set rl wildoptions+=pum")
feed('isome rightleft ') feed('isome rightleft ')
screen:expect([[ screen:expect([[
^ tfelthgir emos| ^ tfelthgir emos|
@ -1435,6 +1435,55 @@ describe('builtin popupmenu', function()
{1: ~}| {1: ~}|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])
-- not rightleft on the cmdline
feed('<esc>:sign ')
screen:expect{grid=[[
drow tfelthgir emos|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
:sign ^ |
]]}
feed('<tab>')
screen:expect{grid=[[
drow tfelthgir emos|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
{1: }{s: define }{1: ~}|
{1: }{n: jump }{1: ~}|
{1: }{n: list }{1: ~}|
{1: }{n: place }{1: ~}|
{1: }{n: undefine }{1: ~}|
{1: }{n: unplace }{1: ~}|
:sign define^ |
]]}
end) end)
it('with multiline messages', function() it('with multiline messages', function()