mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-21 09:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(filetype): update call sites of vim.filetype.match (#19171)

Browse Source 
These were not updated in #18895.
This commit is contained in:
Gregory Anders
2022-06-30 09:54:44 -06:00
committed by GitHub
parent 565f72b968
commit 3b1423bfa7
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/lua/vim/filetype.lua
View File

@@ -1171,57 +1171,57 @@ local extension = {
-- Ignored extensions -- Ignored extensions
bak = function(path, bufnr) bak = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
['dpkg-bak'] = function(path, bufnr) ['dpkg-bak'] = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
['dpkg-dist'] = function(path, bufnr) ['dpkg-dist'] = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
['dpkg-old'] = function(path, bufnr) ['dpkg-old'] = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
['dpkg-new'] = function(path, bufnr) ['dpkg-new'] = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
['in'] = function(path, bufnr) ['in'] = function(path, bufnr)
if vim.fs.basename(path) ~= 'configure.in' then if vim.fs.basename(path) ~= 'configure.in' then
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end end
end, end,
new = function(path, bufnr) new = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
old = function(path, bufnr) old = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
orig = function(path, bufnr) orig = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
pacsave = function(path, bufnr) pacsave = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
pacnew = function(path, bufnr) pacnew = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
rpmsave = function(path, bufnr) rpmsave = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
rmpnew = function(path, bufnr) rmpnew = function(path, bufnr)
local root = vim.fn.fnamemodify(path, ':r') local root = vim.fn.fnamemodify(path, ':r')
return M.match(root, bufnr) return M.match({ buf = bufnr, filename = root })
end, end,
-- END EXTENSION -- END EXTENSION
} }
@@ -2059,7 +2059,7 @@ local pattern = {
['.*~'] = function(path, bufnr) ['.*~'] = function(path, bufnr)
local short = path:gsub('~$', '', 1) local short = path:gsub('~$', '', 1)
if path ~= short and short ~= '' then if path ~= short and short ~= '' then
return M.match(vim.fn.fnameescape(short), bufnr) return M.match({ buf = bufnr, filename = vim.fn.fnameescape(short) })
end end
end, end,
-- END PATTERN -- END PATTERN