feat(context-bar): align the bar to the right

With the bar aligned to the right there is no need for the icon anymore

Author: sudo-tee

lua/opencode/ui/context_bar.lua

@@ -46,13 +46,7 @@ end
 
 local function create_winbar_segments()
   local ctx = context.delta_context()
-  local segments = {
-    {
-      icon = icons.get('context'),
-      text = '',
-      highlight = 'OpencodeContext',
-    },
-  }
+  local segments = {}
 
   local current_file = get_current_file_info(ctx)
   if context.is_context_enabled('current_file') and current_file then
@@ -127,8 +121,9 @@ local function create_winbar_segments()
 end
 
 local function format_winbar_text(segments)
+  local right_align = '%='
   if #segments == 0 then
-    return ''
+    return right_align
   end
 
   local parts = {}
@@ -144,7 +139,7 @@ local function format_winbar_text(segments)
     end
   end
 
-  return ' ' .. table.concat(parts, '')
+  return right_align .. table.concat(parts, '')
 end
 
 local function update_winbar_highlights(win_id)

lua/opencode/ui/icons.lua

@@ -33,7 +33,6 @@ local presets = {
     border = '▌',
     -- context bar
     cursor_data = '󰗧 ',
-    context = ' ',
     error = ' ',
     warning = ' ',
     info = ' ',
@@ -69,7 +68,6 @@ local presets = {
     border = '▌',
     -- context bar
     cursor_data = '[|] ',
-    context = '[Ctx] ',
     error = '[E]',
     warning = '[W]',
     info = '[I] ',

lua/opencode/ui/input_window.lua

@@ -112,8 +112,6 @@ function M.setup(windows)
   M.recover_input(windows)
 
   require('opencode.ui.context_bar').render(windows)
-
-  M.add_winbar_padding(windows)
 end
 
 function M.update_dimensions(windows)
@@ -198,7 +196,6 @@ function M.set_content(text, windows)
   local lines = type(text) == 'table' and text or vim.split(tostring(text), '\n')
 
   vim.api.nvim_buf_set_lines(windows.input_buf, 0, -1, false, lines)
-  M.add_winbar_padding(windows)
 end
 
 function M.set_current_line(text, windows)
@@ -208,7 +205,6 @@ function M.set_current_line(text, windows)
   end
 
   vim.api.nvim_set_current_line(text)
-  M.add_winbar_padding(windows)
 end
 
 function M.remove_mention(mention_name, windows)
@@ -229,7 +225,6 @@ function M.remove_mention(mention_name, windows)
 
   vim.api.nvim_buf_set_lines(windows.input_buf, 0, -1, false, lines)
   require('opencode.ui.mention').highlight_all_mentions(windows.input_buf)
-  M.add_winbar_padding(windows)
 end
 
 function M.is_empty()
@@ -242,34 +237,6 @@ function M.is_empty()
   return #lines == 0 or (#lines == 1 and lines[1] == '')
 end
 
-function M.add_winbar_padding(windows)
-  if not M.mounted(windows) then
-    return
-  end
-
-  local ns_id = vim.api.nvim_create_namespace('winbar_padding')
-  vim.api.nvim_buf_clear_namespace(windows.input_buf, ns_id, 0, -1)
-
-  vim.api.nvim_buf_set_extmark(windows.input_buf, ns_id, 0, 0, {
-    virt_lines = { { { '   ' } } },
-    virt_lines_above = true,
-  })
-
-  M.apply_topfill_workaround(windows)
-end
-
-function M.apply_topfill_workaround(windows)
-  if not M.mounted(windows) then
-    return
-  end
-
-  local topfill = 1
-  local win = windows.input_win
-  if win and vim.api.nvim_win_is_valid(win) then
-    vim.fn.win_execute(win, 'lua vim.fn.winrestview({ topfill = ' .. topfill .. ' })')
-  end
-end
-
 function M.setup_keymaps(windows)
   local keymap = require('opencode.keymap')
   keymap.setup_window_keymaps(config.keymap.input_window, windows.input_buf)
@@ -283,7 +250,6 @@ function M.setup_autocmds(windows, group)
       M.refresh_placeholder(windows)
       state.last_focused_opencode_window = 'input'
       require('opencode.ui.context_bar').render()
-      M.apply_topfill_workaround(windows)
     end,
   })
 
@@ -294,9 +260,6 @@ function M.setup_autocmds(windows, group)
       state.input_content = input_lines
       M.refresh_placeholder(windows, input_lines)
       require('opencode.ui.context_bar').render()
-      if #input_lines == 0 or (#input_lines == 1 and input_lines[1] == '') then
-        M.add_winbar_padding(windows)
-      end
     end,
   })
 

tests/unit/context_bar_spec.lua

@@ -95,7 +95,6 @@ describe('opencode.ui.context_bar', function()
   end)
 
   after_each(function()
-    -- Restore original functions
     context.delta_context = original_delta_context
     context.is_context_enabled = original_is_context_enabled
     icons.get = original_get_icon
@@ -109,15 +108,15 @@ describe('opencode.ui.context_bar', function()
   end)
 
   describe('opencode.ui.context_bar', function()
-    it('renders minimal winbar with context icon only', function()
+    it('renders minimal winbar with right aligh token only', function()
       local mock_input_win = 2001
       local winbar_capture = create_mock_window(mock_input_win)
 
       state.windows = { input_win = mock_input_win }
       context_bar.render()
 
       assert.is_string(winbar_capture.value)
-      assert.is_not_nil(winbar_capture.value:find(icons.get('context')))
+      assert.is_equal(winbar_capture.value, '%=')
     end)
 
     it('renders winbar with current file when present', function()
@@ -207,7 +206,7 @@ describe('opencode.ui.context_bar', function()
       context_bar.render()
 
       assert.is_string(winbar_capture.value)
-      assert.is_not_nil(winbar_capture.value:find(icons.get('context'))) -- Should still have context icon
+      assert.is_equal(winbar_capture.value, '%=')
     end)
 
     it('does nothing when window is invalid', function()