diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/functional/legacy/066_visual_block_tab_spec.lua | 10 | ||||
-rw-r--r-- | test/functional/ui/highlight_spec.lua | 1 | ||||
-rw-r--r-- | test/functional/ui/screen.lua | 17 |
3 files changed, 14 insertions, 14 deletions
diff --git a/test/functional/legacy/066_visual_block_tab_spec.lua b/test/functional/legacy/066_visual_block_tab_spec.lua index 82bb988c67..cd283e6746 100644 --- a/test/functional/legacy/066_visual_block_tab_spec.lua +++ b/test/functional/legacy/066_visual_block_tab_spec.lua @@ -23,18 +23,18 @@ describe('visual block shift and tab characters', function() abcdefghijklmnopqrstuvwxyz]]) feed('gg') - feed([[fe<C-v>4jR<esc>ugvr1:'<lt>,'>yank A<cr>]]) + feed([[fe<C-v>4jR<esc>ugvr1:'<,'>yank A<cr>]]) execute('/^abcdefgh') - feed('<C-v>4jI <esc>j<lt><lt>11|D') + feed('<C-v>4jI <esc>j<<11|D') feed('j7|a <esc>') feed('j7|a <esc>') - feed('j7|a <esc>4k13|<C-v>4j<lt>') + feed('j7|a <esc>4k13|<C-v>4j<') execute('$-5,$yank A') execute([[$-4,$s/\s\+//g]]) - feed('<C-v>4kI <esc>j<lt><lt>') + feed('<C-v>4kI <esc>j<<') feed('j7|a <esc>') feed('j7|a <esc>') - feed('j7|a <esc>4k13|<C-v>4j3<lt>') + feed('j7|a <esc>4k13|<C-v>4j3<') execute('$-4,$yank A') -- Put @a and clean empty lines diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua index 9ab86f401f..3c55c09f95 100644 --- a/test/functional/ui/highlight_spec.lua +++ b/test/functional/ui/highlight_spec.lua @@ -142,6 +142,7 @@ describe('Default highlight groups', function() end) it('end of file markers', function() + nvim('command', 'hi Normal guibg=black') screen:expect([[ ^ | {1:~ }| diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 5d139b367f..8e7d1ed798 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -99,6 +99,7 @@ function Screen.new(width, height) _mouse_enabled = true, _bell = false, _visual_bell = false, + _suspended = true, _attrs = {}, _cursor = { enabled = true, row = 1, col = 1 @@ -114,11 +115,13 @@ function Screen:set_default_attr_ids(attr_ids) end function Screen:attach() - request('ui_attach', self._width, self._height, true) + request('attach_ui', self._width, self._height) + self._suspended = false end function Screen:detach() - request('ui_detach') + request('detach_ui') + self._suspended = true end function Screen:expect(expected, attr_ids) @@ -187,7 +190,7 @@ end function Screen:_handle_eol_clear() local row, col = self._cursor.row, self._cursor.col - self:_clear_block(row, 1, col, self._scroll_region.right - col) + self:_clear_block(row, 1, col, self._width - col) end function Screen:_handle_cursor_goto(row, col) @@ -275,12 +278,8 @@ function Screen:_handle_visual_bell() self._visual_bell = true end -function Screen:_handle_update_fg(fg) - self._fg = fg -end - -function Screen:_handle_update_bg(bg) - self._bg = bg +function Screen:_handle_suspend() + self._suspended = true end function Screen:_clear_block(top, lines, left, columns) |