olexsmir/gopher.nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(struct-tag): add default option

Browse source
This commit is contained in:
Oleksandr Smirnov 2025-10-29 13:45:01 +02:00
parent 848a9dbe97
commit 3ad6f73b57
No known key found for this signature in database
11 changed files with 122 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lua/gopher/config.lua
View file

@ -61,6 +61,10 @@ local default_config = {
-- default tags to add to struct fields
default_tag = "json",
-- default tag option added struct fields, set to nil to disable
---@type string|nil
option = nil,
},
iferr = {
-- choose a custom error message
@ -105,6 +109,7 @@ function config.setup(user_config)
vim.validate("gotag", _config.gotag, "table")
vim.validate("gotag.transform", _config.gotag.transform, "string")
vim.validate("gotag.default_tag", _config.gotag.default_tag, "string")
vim.validate("gotag.option", _config.gotag.option, { "string", "nil" })
vim.validate("iferr", _config.iferr, "table")
vim.validate("iferr.message", _config.iferr.message, { "string", "nil" })
end

19
lua/gopher/struct_tags.lua
View file

@ -9,6 +9,9 @@
--- 2. Run `:GoTagAdd json` to add json tags to struct fields
--- 3. Run `:GoTagRm json` to remove json tags to struct fields
---
--- If you want to add/remove tag with options, you can use `json=omitempty` (where json is tag, and omitempty is its option).
--- Example: `:GoTagAdd xml json=omitempty`
---
--- To clear all tags from struct run: `:GoTagClear`
---
--- NOTE: if you dont specify the tag it will use `json` as default
@ -104,7 +107,7 @@ local function handle_tags(fpath, bufnr, range, user_args)
end
-- Adds tags to a struct under the cursor
-- See |gopher.nvim-struct-tags|
-- See `:h gopher.nvim-struct-tags`
---@param opts gopher.StructTagInput
---@dochide
function struct_tags.add(opts)
@ -114,12 +117,14 @@ function struct_tags.add(opts)
local bufnr = vim.api.nvim_get_current_buf()
local user_args = st.parse_args(opts.input)
handle_tags(fpath, bufnr, opts.range, {
local a = {
"-add-tags",
(user_args.tags ~= "") and user_args.tags or c.gotag.default_tag,
(#user_args.options ~= 0) and "-add-options" or nil,
(#user_args.options ~= 0) and user_args.options or nil,
})
(user_args.options ~= "" or c.gotag.option) and "-add-options" or nil,
(user_args.options ~= "") and user_args.options or c.gotag.option,
}
handle_tags(fpath, bufnr, opts.range, a)
end
-- Removes tags from a struct under the cursor
@ -136,8 +141,8 @@ function struct_tags.remove(opts)
handle_tags(fpath, bufnr, opts.range, {
"-remove-tags",
(user_args.tags ~= "") and user_args.tags or c.gotag.default_tag,
(#user_args.options ~= 0) and "-remove-options" or nil,
(#user_args.options ~= 0) and user_args.options or nil,
(user_args.options ~= "" or c.gotag.option ~= nil) and "-remove-options" or nil,
(user_args.options ~= "") and user_args.options or c.gotag.option,
})
end