From 0e279f3cd0bb03524fff7789287a2eca7f7801ee Mon Sep 17 00:00:00 2001
From: Oleksandr Smirnov <olexsmir@gmail.com>
Date: Fri, 29 Aug 2025 19:18:54 +0300
Subject: [PATCH] refactor(struct_tags): refactor range logic

---
 lua/gopher/struct_tags.lua | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/lua/gopher/struct_tags.lua b/lua/gopher/struct_tags.lua
index a489751..3264e7a 100644
--- a/lua/gopher/struct_tags.lua
+++ b/lua/gopher/struct_tags.lua
@@ -64,19 +64,13 @@ local function handle_tags(fpath, bufnr, range, user_args)
     "-w",
   }
 
-  -- since `-strut` and `-line` cannot be combined together set set them only
-  -- if user doesn't do ranges
-  if range ~= nil then
+  -- `-struct` and `-line` cannot be combined, setting them separately
+  if range or st.is_varstruct then
     table.insert(cmd, "-line")
-    table.insert(cmd, string.format("%d,%d", range.start, range.end_))
+    table.insert(cmd, string.format("%d,%d", (range or st).start, (range or st).end_))
   else
-    if st.is_varstruct then
-      table.insert(cmd, "-line")
-      table.insert(cmd, string.format("%d,%d", st.start, st.end_))
-    else
-      table.insert(cmd, "-struct")
-      table.insert(cmd, st.name)
-    end
+    table.insert(cmd, "-struct")
+    table.insert(cmd, st.name)
   end
 
   for _, v in ipairs(user_args) do
@@ -111,7 +105,7 @@ end
 ---@param args string[]
 ---@return string
 ---@dochide
-local function handler_user_args(args)
+local function handler_user_tags(args)
   if #args == 0 then
     return c.gotag.default_tag
   end
@@ -128,7 +122,7 @@ function struct_tags.add(opts)
   local fpath = vim.fn.expand "%"
   local bufnr = vim.api.nvim_get_current_buf()
 
-  local user_tags = handler_user_args(opts.tags)
+  local user_tags = handler_user_tags(opts.tags)
   handle_tags(fpath, bufnr, opts.range, { "-add-tags", user_tags })
 end
 
@@ -142,7 +136,7 @@ function struct_tags.remove(opts)
   local fpath = vim.fn.expand "%"
   local bufnr = vim.api.nvim_get_current_buf()
 
-  local user_tags = handler_user_args(opts.tags)
+  local user_tags = handler_user_tags(opts.tags)
   handle_tags(fpath, bufnr, opts.range, { "-remove-tags", user_tags })
 end