mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
fix(filetype): match on <afile> rather than <abuf> (#16943)
Filetype detection runs on BufRead and BufNewFile autocommands, both of which can fire without an underlying buffer, so it's incorrect to use <abuf> to determine the file path. Instead, match on <afile> and assume that the buffer we're operating on is the current buffer. This is the same assumption that filetype.vim makes, so it should be safe.
This commit is contained in:
@@ -1449,15 +1449,20 @@ local function dispatch(ft, path, bufnr, ...)
|
||||
end
|
||||
|
||||
---@private
|
||||
function M.match(bufnr)
|
||||
local path = api.nvim_buf_get_name(bufnr)
|
||||
function M.match(name, bufnr)
|
||||
-- When fired from the main filetypedetect autocommand the {bufnr} argument is omitted, so we use
|
||||
-- the current buffer. The {bufnr} argument is provided to allow extensibility in case callers
|
||||
-- wish to perform filetype detection on buffers other than the current one.
|
||||
bufnr = bufnr or api.nvim_get_current_buf()
|
||||
|
||||
-- First check for the simple case where the full path exists as a key
|
||||
local path = vim.fn.fnamemodify(name, ":p")
|
||||
if dispatch(filename[path], path, bufnr) then
|
||||
return
|
||||
end
|
||||
|
||||
-- Next check against just the file name
|
||||
local tail = vim.fn.fnamemodify(path, ":t")
|
||||
local tail = vim.fn.fnamemodify(name, ":t")
|
||||
if dispatch(filename[tail], path, bufnr) then
|
||||
return
|
||||
end
|
||||
@@ -1477,7 +1482,7 @@ function M.match(bufnr)
|
||||
end
|
||||
|
||||
-- Finally, check file extension
|
||||
local ext = vim.fn.fnamemodify(path, ":e")
|
||||
local ext = vim.fn.fnamemodify(name, ":e")
|
||||
if dispatch(extension[ext], path, bufnr) then
|
||||
return
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user