feat: use natural sort order by default (#328)

* Sort entries with natural sorting

* refactor: move natural ordering logic and add config option

---------

Co-authored-by: Steven Arcangeli <stevearc@stevearc.com>
This commit is contained in:
Lucas Eras Paiva 2024-03-12 21:21:54 -05:00 committed by GitHub
parent e045ee3b4e
commit 71b076b3af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 2 deletions

View file

@ -279,6 +279,10 @@ M.register("type", {
end,
})
local function pad_number(int)
return string.format("%012d", int)
end
M.register("name", {
render = function(entry, conf)
error("Do not use the name column. It is for sorting only")
@ -289,7 +293,11 @@ M.register("name", {
end,
get_sort_value = function(entry)
return entry[FIELD_NAME]
if config.view_options.natural_order then
return entry[FIELD_NAME]:gsub("%d+", pad_number)
else
return entry[FIELD_NAME]
end
end,
})

View file

@ -90,6 +90,9 @@ local default_config = {
is_always_hidden = function(name, bufnr)
return false
end,
-- Sort file names in a more intuitive order for humans. Is less performant,
-- so you may want to set to false if you work with large directories.
natural_order = true,
sort = {
-- sort order can be "asc" or "desc"
-- see :help oil-columns to see which columns are sortable

View file

@ -519,7 +519,14 @@ end
---@return fun(a: oil.InternalEntry, b: oil.InternalEntry): boolean
local function get_sort_function(adapter)
local idx_funs = {}
for _, sort_pair in ipairs(config.view_options.sort) do
local sort_config = config.view_options.sort
-- If empty, default to type + name sorting
if vim.tbl_isempty(sort_config) then
sort_config = { { "type", "asc" }, { "name", "asc" } }
end
for _, sort_pair in ipairs(sort_config) do
local col_name, order = unpack(sort_pair)
if order ~= "asc" and order ~= "desc" then
vim.notify_once(