Merge pull request #1804 from neovim/revert-1657-abstract-ui-fixes

Revert "[WIP] "abstract_ui" fixes and improvements"

2 files changed, 9 insertions, 9 deletions

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)