Merge pull request #77 from francescarpi/develop

release: v2025-03-13

Author: francescarpi

README.md

@@ -128,6 +128,9 @@ Take a look at the default shortcuts for navigating between buffers, changing th
     move_buffer_top = "<s-t>",
     move_buffer_bottom = "<s-b>",
     toggle_buffon_window = "<buffonleader>n",
+    --- Toggle window position allows moving the main window position
+    --- between top-right and bottom-right positions
+    toggle_buffon_window_position = "<buffonleader>nn",
     switch_previous_used_buffer = "<buffonleader><buffonleader>",
     close_buffer = "<buffonleader>d",
     close_buffers_above = "<buffonleader>v",

lua/buffon/config.lua

@@ -25,6 +25,9 @@ local default = {
     move_buffer_top = "<s-t>",
     move_buffer_bottom = "<s-b>",
     toggle_buffon_window = "<buffonleader>n",
+    --- Toggle window position allows moving the main window position
+    --- between top-right and bottom-right positions
+    toggle_buffon_window_position = "<buffonleader>nn",
     switch_previous_used_buffer = "<buffonleader><buffonleader>",
     close_buffer = "<buffonleader>d",
     close_buffers_above = "<buffonleader>v",
@@ -52,6 +55,7 @@ local default = {
 ---@field move_buffer_top string|false
 ---@field move_buffer_bottom string|false
 ---@field toggle_buffon_window string
+---@field toggle_buffon_window_position string
 ---@field switch_previous_used_buffer string|false
 ---@field close_buffer string|false
 ---@field close_buffers_above string|false

lua/buffon/maincontroller.lua

@@ -93,6 +93,11 @@ function MainController:get_shortcuts()
       help = "Show/hide buffer list",
       method = self.action_show_hide_buffon_window,
     },
+    {
+      shortcut = "toggle_buffon_window_position",
+      help = "Toggle window position",
+      method = self.action_toggle_window_position,
+    },
     {
       shortcut = "goto_next_buffer",
       help = "Next buffer",
@@ -309,6 +314,10 @@ function MainController:action_show_hide_buffon_window()
   self.main_window:toggle()
 end
 
+function MainController:action_toggle_window_position()
+  self.main_window.window:toggle_position_between_top_right_bottom_right()
+end
+
 function MainController:event_add_buffer(buf)
   local existent_buf, num_page = self.page_controller:get_buffer_and_page(buf.match)
   log.debug("add", vim.fn.fnamemodify(buf.match, ":t"), "in page", num_page)
@@ -523,12 +532,19 @@ end
 --------------------------------------------------------------------------------------------
 
 function MainController:event_buffer_will_rename(buf)
+  if buf.match == "" then
+    return
+  end
+
   log.debug("buffer will be renamed", vim.fn.fnamemodify(buf.match, ":t"))
   self.buffer_will_be_renamed = buf.match
 end
 
 function MainController:event_rename_buffer(buf)
-  assert(self.buffer_will_be_renamed, "new buffer name is required")
+  if not self.buffer_will_be_renamed or self.buffer_will_be_renamed == buf.match then
+    return
+  end
+
   log.debug("set new name", vim.fn.fnamemodify(buf.match, ":t"))
   for _, page in ipairs(self.page_controller.pages) do
     page.bufferslist:rename(self.buffer_will_be_renamed, buf.match)

lua/buffon/page.lua

@@ -117,21 +117,29 @@ function Page:render(active_buffer)
     },
   }
   local filenames = self:_get_filenames(self.bufferslist.buffers)
+  local max_length = utils.calc_max_length(filenames)
 
   for idx, buffer in ipairs(self.bufferslist.buffers) do
     -- content
     local shortcut = self:_get_shortcut(idx)
     local filename = filenames[idx]
     local modified = self:_get_modified(buffer)
     local icon = self:_get_icon(buffer.filename)
-    local line = string.format("%s %s %s%s", shortcut, filename, icon, modified)
+
+    local diff_file_length = max_length - vim.fn.strdisplaywidth(filename)
+    local spaces = string.rep(" ", diff_file_length + 1)
+    if diff_file_length == 0 then
+      spaces = " "
+    end
+
+    local line = string.format("%s %s%s%s%s", shortcut, filename, spaces, icon, modified)
     table.insert(response.content, line)
 
     -- highlights
     local shortcut_start = 0
     local shortcut_end = shortcut_start + #self.config.leader_key + CHAR
     local filename_start = shortcut_end + WHITESPACE
-    local filename_end = filename_start + #filename + WHITESPACE + ICON
+    local filename_end = filename_start + #filename + #spaces + WHITESPACE + ICON
     local modified_start = filename_end + WHITESPACE
     local modified_end = modified_start + MODIFIED
 

lua/buffon/ui/window.lua

@@ -1,4 +1,5 @@
 local log = require("buffon.log")
+local utils = require("buffon.utils")
 
 local M = {}
 
@@ -114,19 +115,6 @@ function Window:set_highlight(highlights)
   end
 end
 
----@return number
-function Window:get_max_width()
-  local lines = vim.api.nvim_buf_get_lines(self.buf_id, 0, -1, false)
-  local max_width = 0
-  for _, line in ipairs(lines) do
-    local line_length = vim.fn.strdisplaywidth(line)
-    if line_length > max_width then
-      max_width = line_length
-    end
-  end
-  return max_width
-end
-
 function Window:refresh_dimensions()
   if not self.win_id then
     return
@@ -136,7 +124,7 @@ function Window:refresh_dimensions()
   local editor_lines = vim.api.nvim_get_option("lines")
   local lines = vim.api.nvim_buf_get_lines(self.buf_id, 0, -1, false)
   local height = #lines
-  local max_width = self:get_max_width()
+  local max_width = utils.calc_max_length(vim.api.nvim_buf_get_lines(self.buf_id, 0, -1, false))
   local row = 1
   local col = 0
 
@@ -163,6 +151,14 @@ function Window:refresh_dimensions()
   vim.api.nvim_win_set_config(self.win_id, cfg)
 end
 
+function Window:toggle_position_between_top_right_bottom_right()
+  if self.position == WIN_POSITION.TOP_RIGHT then
+    self.position = WIN_POSITION.BOTTOM_RIGHT
+  else
+    self.position = WIN_POSITION.TOP_RIGHT
+  end
+end
+
 M.Window = Window
 M.WIN_POSITIONS = WIN_POSITION
 

lua/buffon/utils.lua

@@ -19,6 +19,19 @@ M.replace_leader = function(cfg, shortcut)
   return replaced_string
 end
 
+---@param lines table<string>
+---@return number
+M.calc_max_length = function(lines)
+  local max_length = 0
+  for _, line in ipairs(lines) do
+    local line_length = vim.fn.strdisplaywidth(line)
+    if line_length > max_length then
+      max_length = line_length
+    end
+  end
+  return max_length
+end
+
 ---@class BuffonRecentlyClosed
 ---@field filenames? table<string>
 ---@field limit? number

tests/config_spec.lua

@@ -25,6 +25,7 @@ describe("config", function()
         move_buffer_top = "<s-t>",
         move_buffer_bottom = "<s-b>",
         toggle_buffon_window = "<buffonleader>n",
+        toggle_buffon_window_position = "<buffonleader>nn",
         switch_previous_used_buffer = "<buffonleader><buffonleader>",
         close_buffer = "<buffonleader>d",
         close_buffers_above = "<buffonleader>v",

tests/maincontroller_spec.lua

@@ -15,6 +15,7 @@ end
 
 local default_shortcuts = {
   "toggle_buffon_window",
+  "toggle_buffon_window_position",
   "goto_next_buffer",
   "goto_previous_buffer",
   "next_page",
@@ -60,6 +61,7 @@ describe("maincontrolelr", function()
     local shortcuts = ctrl:get_shortcuts()
     compare_shortcuts(shortcuts, {
       "toggle_buffon_window",
+      "toggle_buffon_window_position",
       "goto_next_buffer",
       "goto_previous_buffer",
       "next_page",
@@ -96,6 +98,7 @@ describe("maincontrolelr", function()
     local shortcuts = ctrl:get_shortcuts()
     compare_shortcuts(shortcuts, {
       "toggle_buffon_window",
+      "toggle_buffon_window_position",
       "goto_next_buffer",
       "goto_previous_buffer",
       "move_buffer_up",

tests/page_spec.lua

@@ -23,15 +23,15 @@ describe("page", function()
     ---@type BuffonPageRender
     local render = pag:render("/foo/buffer2.lua")
     eq(render.content, {
-      ";q buffer1.lua ",
-      ";w buffer2.lua ",
-      ";e buffer3.lua ",
-      ";r buffer4.lua ",
-      ";y buffer5.lua ",
-      ";u buffer6.lua ",
-      ";i buffer7.lua ",
-      ";o buffer8.lua ",
-      ";p buffer9.lua ",
+      ";q buffer1.lua  ",
+      ";w buffer2.lua  ",
+      ";e buffer3.lua  ",
+      ";r buffer4.lua  ",
+      ";y buffer5.lua  ",
+      ";u buffer6.lua  ",
+      ";i buffer7.lua  ",
+      ";o buffer8.lua  ",
+      ";p buffer9.lua  ",
       "   buffer10.lua ",
     })
 
@@ -87,15 +87,15 @@ describe("page", function()
 
     eq(render.highlights.Label, {
       {
-        col_end = 16,
+        col_end = 18,
         col_start = 3,
         line = 1,
       },
     })
 
     eq(render.highlights.LineNr, {
       {
-        col_end = 16,
+        col_end = 18,
         col_start = 0,
         line = 0,
       },