From afbe7736a4966f22146d857f246eac01cd080773 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 10 Jul 2024 19:47:28 +0200 Subject: vim-patch:9.1.0555: filetype: angular ft detection is still problematic Problem: filetype: angular ft detection is still problematic (after 9.1.0551) Solution: detect htmlangular filetype only by inspecting the content, do not try to determine it from a generic name like '*.component.html' For the reasons mentioned here: https://github.com/vim/vim/pull/13594#issuecomment-1834465890 related: vim/vim#15190 related: vim/vim#13594 related: vim/vim#13604 https://github.com/vim/vim/commit/c03f631b7b01e672787b222a55898f8dcac8d859 Co-authored-by: Christian Brabandt --- runtime/lua/vim/filetype/detect.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'runtime/lua/vim') diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua index 8a217a4ac2..95e55ebb21 100644 --- a/runtime/lua/vim/filetype/detect.lua +++ b/runtime/lua/vim/filetype/detect.lua @@ -710,12 +710,13 @@ function M.haredoc(path, _) end --- @type vim.filetype.mapfn -function M.html(path, bufnr) - -- Test if the filename follows the Angular component template convention - local filename = fn.fnamemodify(path, ':t') - if filename:find('%.component%.html$') then - return 'htmlangular' - end +function M.html(_, bufnr) + -- Disabled for the reasons mentioned here: + -- https://github.com/vim/vim/pull/13594#issuecomment-1834465890 + -- local filename = fn.fnamemodify(path, ':t') + -- if filename:find('%.component%.html$') then + -- return 'htmlangular' + -- end for _, line in ipairs(getlines(bufnr, 1, 40)) do if -- cgit