fix(filetype): expand tildes in filetype patterns (#17091)

This allows patterns like ["~/.config/foo"] = "fooscript" to work.
neovim · Jan 14, 2022 · 59ea8fa · 59ea8fa
1 parent bac4bb1
commit 59ea8fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
@@ -1398,7 +1398,7 @@ local pattern_sorted = sort_by_priority(pattern)
 
 ---@private
 local function normalize_path(path)
- return (path:gsub("\\", "/"))
+ return (path:gsub("\\", "/"):gsub("^~", vim.env.HOME))
 end
 
 --- Add new filetype mappings.

diff --git a/test/functional/lua/filetype_spec.lua b/test/functional/lua/filetype_spec.lua
@@ -72,10 +72,10 @@ describe('vim.filetype', function()
  local root = ...
  vim.filetype.add({
  pattern = {
- [root .. '/blog/.*%.txt'] = 'markdown',
+ ['~/blog/.*%.txt'] = 'markdown',
  }
  })
- vim.filetype.match(root .. '/blog/why_neovim_is_awesome.txt')
+ vim.filetype.match('~/blog/why_neovim_is_awesome.txt')
  return vim.bo.filetype
  ]], root))
  end)