Skip to content

fix(config): Respect user delimiter.ft configuration completely #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2025
Merged

fix(config): Respect user delimiter.ft configuration completely #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions lua/csvview/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,29 @@ M._highlights = {
{ name = "CsvViewCol8", link = "csvCol8" },
}

--- Merge two configuration tables.
---@param internal CsvView.InternalOptions
---@param user CsvView.Options
---@return CsvView.InternalOptions
local function merge_config(internal, user)
local config = vim.tbl_deep_extend("force", internal, user)

-- Do not merge delimiter.ft, prioritize user settings
-- This considers cases like disabling the default ft mappings for csv and tsv.
if user.parser and type(user.parser.delimiter) == "table" then
if type(user.parser.delimiter.ft) == "table" then
config.parser.delimiter.ft = vim.deepcopy(user.parser.delimiter.ft)
end
end

return config
end

--- get config
---@param opts? CsvView.Options
---@return CsvView.InternalOptions
function M.get(opts)
return vim.tbl_deep_extend("force", M.options, opts or {})
return merge_config(M.options, opts or {})
end

--- setup
Expand Down Expand Up @@ -322,7 +340,7 @@ function M.setup(opts)
end
end

M.options = vim.tbl_deep_extend("force", M.defaults, opts or {})
M.options = merge_config(M.defaults, opts or {})
end

return M