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

fix(fs): use generics for better typing

Browse Source
This commit is contained in:
altermo
2024-03-06 17:18:00 +01:00
committed by Lewis Russell
parent 0101bdaa1a
commit ae5095cac9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/lua.txt
View File

@@ -2848,7 +2848,7 @@ vim.fs.basename({file}) *vim.fs.basename()*
Return the basename of the given path Return the basename of the given path
Parameters: ~ Parameters: ~
• {file} (`string`) Path • {file} (`string?`) Path
Return: ~ Return: ~
(`string?`) Basename of {file} (`string?`) Basename of {file}
@@ -2876,7 +2876,7 @@ vim.fs.dirname({file}) *vim.fs.dirname()*
Return the parent directory of the given path Return the parent directory of the given path
Parameters: ~ Parameters: ~
• {file} (`string`) Path • {file} (`string?`) Path
Return: ~ Return: ~
(`string?`) Parent directory of {file} (`string?`) Parent directory of {file}

11
runtime/lua/vim/fs.lua
View File

@@ -39,8 +39,9 @@ end
--- Return the parent directory of the given path --- Return the parent directory of the given path
--- ---
---@param file (string) Path ---@generic T : string|nil
---@return string|nil Parent directory of {file} ---@param file T Path
---@return T Parent directory of {file}
function M.dirname(file) function M.dirname(file)
if file == nil then if file == nil then
return nil return nil
@@ -53,6 +54,7 @@ function M.dirname(file)
elseif file == '/' or file:match('^/[^/]+$') then elseif file == '/' or file:match('^/[^/]+$') then
return '/' return '/'
end end
---@type string
local dir = file:match('[/\\]$') and file:sub(1, #file - 1) or file:match('^([/\\]?.+)[/\\]') local dir = file:match('[/\\]$') and file:sub(1, #file - 1) or file:match('^([/\\]?.+)[/\\]')
if iswin and dir:match('^%w:$') then if iswin and dir:match('^%w:$') then
return dir .. '/' return dir .. '/'
@@ -62,8 +64,9 @@ end
--- Return the basename of the given path --- Return the basename of the given path
--- ---
---@param file string Path ---@generic T : string|nil
---@return string|nil Basename of {file} ---@param file T Path
---@return T Basename of {file}
function M.basename(file) function M.basename(file)
if file == nil then if file == nil then
return nil return nil