ref: local m → local Groups

Also creates a clear naming distinction between `group_clumps` and
`groups`.

autoload/bufferline.vim

@@ -11,11 +11,11 @@ endfunc
 "========================
 
 function! bufferline#update(...)
-  call luaeval("require'barbar.render'.update(_A)", get(a:, 1, v:null))
+  call luaeval("require'barbar.ui.render'.update(_A)", get(a:, 1, v:null))
 endfu
 
 function! bufferline#update_async(...)
-  call timer_start(get(a:, 2, 1), {-> luaeval("require'barbar.render'.update(_A)", get(a:, 1, v:null))})
+  call timer_start(get(a:, 2, 1), {-> luaeval("require'barbar.ui.render'.update(_A)", get(a:, 1, v:null))})
 endfu
 
 function! bufferline#render(update_names) abort
@@ -43,7 +43,7 @@ function! bufferline#order_by_window_number()
 endfunc
 
 function! bufferline#close(abuf)
-  call luaeval("require'barbar.render'.close_buffer_animated(_A)", a:abuf)
+  call luaeval("require'barbar.ui.render'.close_buffer_animated(_A)", a:abuf)
 endfunc
 
 function! bufferline#close_direct(abuf)

lua/barbar.lua

@@ -10,7 +10,7 @@ local api = require'barbar.api'
 local bbye = require'barbar.bbye'
 local events = require'barbar.events'
 local notify = require'barbar.utils'.notify
-local render = require'barbar.render'
+local render = require'barbar.ui.render'
 local state = require'barbar.state'
 local utils = require'barbar.utils'
 

lua/barbar/api.lua

@@ -21,8 +21,8 @@ local bbye = require'barbar.bbye'
 local Buffer = require'barbar.buffer'
 local config = require'barbar.config'
 local JumpMode = require'barbar.jump_mode'
-local Layout = require'barbar.layout'
-local render = require'barbar.render'
+local Layout = require'barbar.ui.layout'
+local render = require'barbar.ui.render'
 local state = require'barbar.state'
 local utils = require'barbar.utils'
 

lua/barbar/events.lua

@@ -26,7 +26,7 @@ local bbye = require'barbar.bbye'
 local config = require'barbar.config'
 local highlight = require'barbar.highlight'
 local JumpMode = require'barbar.jump_mode'
-local render = require'barbar.render'
+local render = require'barbar.ui.render'
 local state = require'barbar.state'
 local utils = require'barbar.utils'
 
@@ -48,7 +48,7 @@ function events.augroups(clear)
   end
 
   return create_augroup('barbar_misc', {clear = clear}),
-    create_augroup('barbar_render', {clear = clear})
+    create_augroup('barbar.ui.render', {clear = clear})
 end
 
 --- What to do when clicking a buffer close button

lua/barbar/layout.lua → lua/barbar/ui/layout.lua

@@ -26,17 +26,17 @@ local SLASH_LEN = #'/'
 --- The length of one space (`#' '`)
 local SPACE_LEN = #' '
 
---- @class barbar.layout.data
+--- @class barbar.ui.layout.data
 --- @field total_width integer the total width of the tabline, equals to &columns
---- @field left barbar.layout.data.side left offset data
---- @field right barbar.layout.data.side right offset data
---- @field buffers barbar.layout.data.buffers buffer data
---- @field tabpages barbar.layout.data.tabpages tabpage data
+--- @field left barbar.ui.layout.data.side left offset data
+--- @field right barbar.ui.layout.data.side right offset data
+--- @field buffers barbar.ui.layout.data.buffers buffer data
+--- @field tabpages barbar.ui.layout.data.tabpages tabpage data
 
---- @class barbar.layout.data.side
+--- @class barbar.ui.layout.data.side
 --- @field width integer the amount of space allocated
 
---- @class barbar.layout.data.buffers
+--- @class barbar.ui.layout.data.buffers
 --- @field width integer the amount of space allocated to the buffers
 --- @field pinned_width integer the amount of space used by pinned buffers
 --- @field unpinned_width integer the amount of space used by pinned buffers
@@ -46,16 +46,16 @@ local SPACE_LEN = #' '
 --- @field base_widths integer[] the minimum amount of space taken up by each buffer
 --- @field scroll_max integer the maximum position which can be scrolled to
 
---- @class barbar.layout.data.tabpages
+--- @class barbar.ui.layout.data.tabpages
 --- @field width integer the amount of space allocated to the tabpage indicator
 
 
---- @class barbar.Layout
+--- @class barbar.ui.layout
 --- @field buffers integer[] different from `state.buffers` in that the `hide` option is respected. Only updated when calling `calculate_buffers_width`.
 local Layout = { buffers = {} }
 
 --- Calculate the current layout of the bufferline.
---- @return barbar.layout.data
+--- @return barbar.ui.layout.data
 function Layout.calculate()
 
   local total_width = get_option('columns')