Skip to content

fix: removed wrappers, included warning on invalid user command #99

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

Open
DrKJeff16 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: removed wrappers, included warning on invalid user command #99

Show file tree
Hide file tree
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
6 changes: 1 addition & 5 deletions lua/spinner.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ require("spinner.config").setup()
---@class spinner
local M = {}

---Setup config.
---@param opts? spinner.Config
function M.setup(opts)
require("spinner.config").setup(opts)
end
M.setup = require("spinner.config").setup

---Start spinner.
---@param id string spinner id.
Expand Down
30 changes: 18 additions & 12 deletions lua/spinner/cmd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,29 @@ local function spinner_completion(engine)
end

---@param engine spinner.Engine
local function spinner_cmd(engine)
function M.setup(engine)
api.nvim_create_user_command("Spinner", function(opts)
if vim.tbl_isempty(opts.fargs) then
vim.notify(
"[spinner.nvim]: Missing subcommand. Use one of: "
.. table.concat(subcmds, ", "),
("[spinner.nvim]: Missing subcommand. Use one of: %s"):format(
table.concat(subcmds, ", ")
),
vim.log.levels.WARN
)
return
end

local subcmd = opts.fargs[1]
if not vim.list_contains(subcmds, subcmd) then
vim.notify(
("[spinner.nvim]: Invalid subcommand. Use one of: %s"):format(
table.concat(subcmds, ", ")
),
vim.log.levels.WARN
)
return
end

local spinner_ids = { unpack(opts.fargs, 2) } -- All remaining arguments are spinner IDs

-- Deduplicate spinner IDs while preserving order
Expand All @@ -65,10 +76,10 @@ local function spinner_cmd(engine)
-- Continue to next spinner instead of returning
elseif not vim.list_contains(subcmds, subcmd) then
vim.notify(
"[spinner.nvim]: Unknown subcommand '"
.. subcmd
.. "'. Use one of: "
.. table.concat(subcmds, ", "),
("[spinner.nvim]: Unknown subcommand '%s'. Use one of: %s"):format(
subcmd,
table.concat(subcmds, ", ")
),
vim.log.levels.WARN
)
return
Expand All @@ -94,9 +105,4 @@ local function spinner_cmd(engine)
})
end

---@param engine spinner.Engine
function M.setup(engine)
spinner_cmd(engine)
end

return M
Loading