IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(filetype): correct vim.fn.did_filetype() handling (#18725)

Browse Source
This commit is contained in:
notomo 2022-05-24 09:55:03 +09:00 committed by GitHub
parent a20892c4bc
commit 5eaf9ef811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/lua/vim/filetype/detect.lua
View File

@ -62,6 +62,11 @@ local matchregex = (function()
end
end)()
---@private
local did_filetype = function()
return vim.fn.did_filetype() ~= 0
end
-- luacheck: push no unused args
-- luacheck: push ignore 122
@ -195,7 +200,7 @@ function M.change(bufnr)
end
function M.csh(path, bufnr)
if vim.fn.did_filetype() then
if did_filetype() then
-- Filetype was already detected
return
end
@ -252,8 +257,7 @@ function M.dep3patch(path, bufnr)
end
function M.dtrace(bufnr)
local did_filetype = vim.fn.did_filetype()
if did_filetype and did_filetype ~= 0 then
if did_filetype() then
-- Filetype was already detected
return
end
@ -811,7 +815,7 @@ end
-- Also called from filetype.lua
function M.sh(path, bufnr, name)
if vim.fn.did_filetype() or path:find(vim.g.ft_ignore_pat) then
if did_filetype() or path:find(vim.g.ft_ignore_pat) then
-- Filetype was already detected or detection should be skipped
return
end
@ -844,7 +848,7 @@ end
-- For shell-like file types, check for an "exec" command hidden in a comment, as used for Tcl.
-- Also called from scripts.vim, thus can't be local to this script. [TODO]
function M.shell(path, bufnr, name)
if vim.fn.did_filetype() or matchregex(path, vim.g.ft_ignore_pat) then
if did_filetype() or matchregex(path, vim.g.ft_ignore_pat) then
-- Filetype was already detected or detection should be skipped
return
end