mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pack): improve vim.pack.add() input validation

Browse Source
This commit is contained in:
Evgeni Chasnovski
2025-07-29 16:06:01 +03:00
parent 1ee18b4061
commit 28e2a5c151
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/lua/vim/pack.lua
View File

@@ -209,7 +209,11 @@ end
--- @param x string|vim.VersionRange --- @param x string|vim.VersionRange
--- @return boolean --- @return boolean
local function is_version(x) local function is_version(x)
return type(x) == 'string' or (pcall(x.has, x, '1')) return type(x) == 'string' or (type(x) == 'table' and pcall(x.has, x, '1'))
end
local function is_nonempty_string(x)
return type(x) == 'string' and x ~= ''
end end
--- @return string --- @return string
@@ -239,9 +243,10 @@ end
local function normalize_spec(spec) local function normalize_spec(spec)
spec = type(spec) == 'string' and { src = spec } or spec spec = type(spec) == 'string' and { src = spec } or spec
vim.validate('spec', spec, 'table') vim.validate('spec', spec, 'table')
vim.validate('spec.src', spec.src, 'string') vim.validate('spec.src', spec.src, is_nonempty_string, false, 'non-empty string')
local name = (spec.name or spec.src:gsub('%.git$', '')):match('[^/]+$') local name = spec.name or spec.src:gsub('%.git$', '')
vim.validate('spec.name', name, 'string') name = (type(name) == 'string' and name or ''):match('[^/]+$') or ''
vim.validate('spec.name', name, is_nonempty_string, true, 'non-empty string')
vim.validate('spec.version', spec.version, is_version, true, 'string or vim.VersionRange') vim.validate('spec.version', spec.version, is_version, true, 'string or vim.VersionRange')
return { src = spec.src, name = name, version = spec.version } return { src = spec.src, name = name, version = spec.version }
end end