fix(filetype.lua): escape expansion of ~ when used as a pattern

This commit is contained in:
James McCoy 2022-05-02 00:15:16 -04:00
parent e5f6f20968
commit 88595fbb21
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
2 changed files with 14 additions and 3 deletions

View File

@ -1480,8 +1480,18 @@ end
local pattern_sorted = sort_by_priority(pattern)
---@private
local function normalize_path(path)
return (path:gsub("\\", "/"):gsub("^~", vim.env.HOME))
local function normalize_path(path, as_pattern)
local normal = path:gsub("\\", '/')
if normal:find('^~') then
if as_pattern then
-- Escape Lua's metacharacters when $HOME is used in a pattern.
-- The rest of path should already be properly escaped.
normal = vim.env.HOME:gsub('[-^$()%%.%[%]+?]', '%%%0') .. normal:sub(2)
else
normal = vim.env.HOME .. normal:sub(2)
end
end
return normal
end
--- Add new filetype mappings.
@ -1550,7 +1560,7 @@ function M.add(filetypes)
end
for k, v in pairs(filetypes.pattern or {}) do
pattern[normalize_path(k)] = v
pattern[normalize_path(k, true)] = v
end
if filetypes.pattern then

View File

@ -70,6 +70,7 @@ describe('vim.filetype', function()
it('works with patterns', function()
eq('markdown', exec_lua([[
local root = ...
vim.env.HOME = '/a-funky+home%dir'
vim.filetype.add({
pattern = {
['~/blog/.*%.txt'] = 'markdown',