neovim

commit fedbf32250ba303ee06c751e798c28c5a3f05862
parent f6e5366d0077e9f171651f37282cb5c47629d1b6
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sat,  2 Dec 2023 09:42:16 +0800

vim-patch:9.0.2139: html.angular ft is problematic (#26357)

Problem:  html.angular ft is problematic
Solution: partly revert v9.0.2137

The html.angular filetype causes issues and does not trigger FileType
autocommands for the html or angular filetypes.

So let's roll back that particular change and detect this only as html
file

related: https://github.com/vim/vim/pull/13594#issuecomment-1834465890

closes: vim/vim#13604

https://github.com/vim/vim/commit/4f3480c94358e3b938594fc3574477e780525cd7

Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat:
M
runtime/lua/vim/filetype.lua
 | 
1
-
M
test/old/testdir/test_filetype.vim
 | 
3
+--

2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
@@ -1717,7 +1717,6 @@ local pattern = {
   ['.*/etc/host%.conf'] = 'hostconf',
   ['.*/etc/hosts%.deny'] = 'hostsaccess',
   ['.*/etc/hosts%.allow'] = 'hostsaccess',
-  ['.*%.component%.html'] = 'html.angular',
   ['.*%.html%.m4'] = 'htmlm4',
   ['.*/%.i3/config'] = 'i3config',
   ['.*/i3/config'] = 'i3config',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
@@ -308,8 +308,7 @@ func s:GetFilenameChecks() abort
     \ 'hoon': ['file.hoon'],
     \ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'],
     \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
-    \ 'html': ['file.html', 'file.htm', 'file.cshtml'],
-    \ 'html.angular': ['file.component.html'],
+    \ 'html': ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'],
     \ 'htmlm4': ['file.html.m4'],
     \ 'httest': ['file.htt', 'file.htb'],
     \ 'hurl': ['file.hurl'],