mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-21 08:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2383 from mhinz/fix-left-click

Browse Source 
Fix visual selection after left click on tabline
This commit is contained in:
Justin M. Keyes
2015-04-28 10:09:31 -04:00
parent 2d4a6843fc 6fb66f4416
commit 7315b9d872
2 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/normal.c
View File

@@ -2067,6 +2067,7 @@ do_mouse (
} else if (is_drag && in_tab_line) {
c1 = TabPageIdxs[mouse_col];
tabpage_move(c1 <= 0 ? 9999 : c1 - 1);
in_tab_line = false;
return false;
}

64
test/functional/ui/mouse_spec.lua
View File

@@ -57,6 +57,33 @@ describe('Mouse input', function()
]])
end)
it('left click in tabline switches to tab', function()
local tab_attrs = {
tab = { background=Screen.colors.LightGrey, underline=true },
sel = { bold=true },
fill = { reverse=true }
}
execute('%delete')
insert('this is foo')
execute('silent file foo | tabnew | file bar')
insert('this is bar')
screen:expect([[
{tab: + foo }{sel: + bar }{fill: }{tab:X}|
this is ba^r |
~ |
~ |
|
]], tab_attrs)
feed('<LeftMouse><4,0>')
screen:expect([[
{sel: + foo }{tab: + bar }{fill: }{tab:X}|
this is fo^o |
~ |
~ |
|
]], tab_attrs)
end)
it('left drag changes visual selection', function()
-- drag events must be preceded by a click
feed('<LeftMouse><2,1>')
@@ -93,6 +120,43 @@ describe('Mouse input', function()
]])
end)
it('left drag changes visual selection after tab click', function()
local tab_attrs = {
tab = { background=Screen.colors.LightGrey, underline=true },
sel = { bold=true },
fill = { reverse=true },
vis = { background=Screen.colors.LightGrey }
}
execute('silent file foo | tabnew | file bar')
insert('this is bar')
execute('tabprevious') -- go to first tab
screen:expect([[
{sel: + foo }{tab: + bar }{fill: }{tab:X}|
mouse |
support and selectio^n |
~ |
|
]], tab_attrs)
feed('<LeftMouse><10,0><LeftRelease>') -- go to second tab
helpers.wait()
feed('<LeftMouse><0,1>')
screen:expect([[
{tab: + foo }{sel: + bar }{fill: }{tab:X}|
^this is bar |
~ |
~ |
|
]], tab_attrs)
feed('<LeftDrag><4,1>')
screen:expect([[
{tab: + foo }{sel: + bar }{fill: }{tab:X}|
{vis:this}^ is bar |
~ |
~ |
{sel:-- VISUAL --} |
]], tab_attrs)
end)
it('two clicks will select the word and enter VISUAL', function()
feed('<LeftMouse><2,2><LeftMouse><2,2>')
screen:expect([[