diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-12-02 09:42:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-02 09:42:16 +0800 |
| commit | fedbf32250ba303ee06c751e798c28c5a3f05862 (patch) | |
| tree | 31a604ede30b9cdc2db887552eed7bc267454fa9 | |
| parent | f6e5366d0077e9f171651f37282cb5c47629d1b6 (diff) | |
| download | rneovim-fedbf32250ba303ee06c751e798c28c5a3f05862.tar.gz rneovim-fedbf32250ba303ee06c751e798c28c5a3f05862.tar.bz2 rneovim-fedbf32250ba303ee06c751e798c28c5a3f05862.zip | |
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>
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 1 | ||||
| -rw-r--r-- | test/old/testdir/test_filetype.vim | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 2bbc545fc4..60882d4432 100644 --- 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 index 18e878e04e..c77ccac3a1 100644 --- 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'], |