From 19ab948e25825a1b8823a391b733cc461f3010f7 Mon Sep 17 00:00:00 2001 From: nyngwang Date: Sun, 5 Mar 2023 23:57:33 +0800 Subject: [PATCH 1/3] feat: add `setup.view_options.is_excluded` --- lua/oil/config.lua | 4 ++++ lua/oil/view.lua | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lua/oil/config.lua b/lua/oil/config.lua index f239f71..45f5446 100644 --- a/lua/oil/config.lua +++ b/lua/oil/config.lua @@ -56,6 +56,10 @@ local default_config = { is_hidden_file = function(name, bufnr) return vim.startswith(name, ".") end, + -- This function defines what will never be shown, even when `show_hidden` is set + is_excluded = function (name, bufnr) + return false + end }, -- Configuration for the floating window in oil.open_float float = { diff --git a/lua/oil/view.lua b/lua/oil/view.lua index dca3844..b07ca52 100644 --- a/lua/oil/view.lua +++ b/lua/oil/view.lua @@ -15,7 +15,8 @@ local last_cursor_entry = {} ---@return boolean M.should_display = function(entry, bufnr) local name = entry[FIELD.name] - return config.view_options.show_hidden or not config.view_options.is_hidden_file(name, bufnr) + return not config.view_options.is_excluded(name, bufnr) + and (not config.view_options.is_hidden_file(name, bufnr) or config.view_options.show_hidden) end ---@param bufname string From fe0f6c389f9cf532063ca50dbc9f4c9683505a0b Mon Sep 17 00:00:00 2001 From: nyngwang Date: Sun, 19 Mar 2023 07:02:23 +0800 Subject: [PATCH 2/3] refactor: rename --- lua/oil/config.lua | 2 +- lua/oil/view.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/oil/config.lua b/lua/oil/config.lua index 45f5446..53115f7 100644 --- a/lua/oil/config.lua +++ b/lua/oil/config.lua @@ -57,7 +57,7 @@ local default_config = { return vim.startswith(name, ".") end, -- This function defines what will never be shown, even when `show_hidden` is set - is_excluded = function (name, bufnr) + is_always_hidden = function (name, bufnr) return false end }, diff --git a/lua/oil/view.lua b/lua/oil/view.lua index b07ca52..b3bd75e 100644 --- a/lua/oil/view.lua +++ b/lua/oil/view.lua @@ -15,7 +15,7 @@ local last_cursor_entry = {} ---@return boolean M.should_display = function(entry, bufnr) local name = entry[FIELD.name] - return not config.view_options.is_excluded(name, bufnr) + return not config.view_options.is_always_hidden(name, bufnr) and (not config.view_options.is_hidden_file(name, bufnr) or config.view_options.show_hidden) end From c07cf810eb31a48661f2117c243323ef22437c52 Mon Sep 17 00:00:00 2001 From: nyngwang Date: Sun, 19 Mar 2023 07:12:18 +0800 Subject: [PATCH 3/3] fix Stylua --- lua/oil/config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/oil/config.lua b/lua/oil/config.lua index fdf4ccd..f25fdfb 100644 --- a/lua/oil/config.lua +++ b/lua/oil/config.lua @@ -59,9 +59,9 @@ local default_config = { return vim.startswith(name, ".") end, -- This function defines what will never be shown, even when `show_hidden` is set - is_always_hidden = function (name, bufnr) + is_always_hidden = function(name, bufnr) return false - end + end, }, -- Configuration for the floating window in oil.open_float float = {