From 7cde5aab10f564408e9ac349d457d755422d58cd Mon Sep 17 00:00:00 2001 From: forestchen1224 Date: Fri, 14 Feb 2025 06:22:54 +0800 Subject: [PATCH] fix: disable_preview respected when preview_method != "load" (#577) * fix bug of disable_preview file should not loaded if disable_preview is true * refeactor function open_preview about disable_preview switch the condition checking `disable_preview` of `if` move the longer condition to the `elseif` swap their repective code blocks to maintain the same functionality * refactor: simplify conditionals * fix: missing then --------- Co-authored-by: Steven Arcangeli <506791+stevearc@users.noreply.github.com> --- lua/oil/init.lua | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lua/oil/init.lua b/lua/oil/init.lua index e11400d..5f780b8 100644 --- a/lua/oil/init.lua +++ b/lua/oil/init.lua @@ -556,18 +556,19 @@ M.open_preview = function(opts, callback) local entry_is_file = not vim.endswith(normalized_url, "/") local filebufnr - if - entry_is_file - and config.preview_win.preview_method ~= "load" - and not util.file_matches_bufreadcmd(normalized_url) - then - filebufnr = - util.read_file_to_scratch_buffer(normalized_url, config.preview_win.preview_method) - elseif entry_is_file and config.preview_win.disable_preview(normalized_url) then - filebufnr = vim.api.nvim_create_buf(false, true) - vim.bo[filebufnr].bufhidden = "wipe" - vim.bo[filebufnr].buftype = "nofile" - util.render_text(filebufnr, "Preview disabled", { winid = preview_win }) + if entry_is_file then + if config.preview_win.disable_preview(normalized_url) then + filebufnr = vim.api.nvim_create_buf(false, true) + vim.bo[filebufnr].bufhidden = "wipe" + vim.bo[filebufnr].buftype = "nofile" + util.render_text(filebufnr, "Preview disabled", { winid = preview_win }) + elseif + config.preview_win.preview_method ~= "load" + and not util.file_matches_bufreadcmd(normalized_url) + then + filebufnr = + util.read_file_to_scratch_buffer(normalized_url, config.preview_win.preview_method) + end end if not filebufnr then