diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-07-10 19:23:39 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-10 19:31:00 +0200 |
| commit | c03f631b7b01e672787b222a55898f8dcac8d859 (patch) | |
| tree | ff56f0527d4c4e8127d76a545381f5bc9bc3d643 | |
| parent | 4ff3a9b1e3ba45f9dbd0ea8c721f27d9315c4d93 (diff) | |
patch 9.1.0555: filetype: angular ft detection is still problematicv9.1.0555
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: #15190
related: #13594
related: #13604
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/autoload/dist/ft.vim | 9 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 1a4195a9de..3c7d85cec6 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -407,10 +407,11 @@ export def FThtml() var n = 1 # Test if the filename follows the Angular component template convention - if expand('%:t') =~ '^.*\.component\.html$' - setf htmlangular - return - endif + # Disabled for the reasons mentioned here: #13594 + # if expand('%:t') =~ '^.*\.component\.html$' + # setf htmlangular + # return + # endif while n < 40 && n <= line("$") # Check for Angular diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index de8788660e..3b0b2e99a5 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -335,8 +335,8 @@ def s:GetFilenameChecks(): dict<list<string>> 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'], - htmlangular: ['file.component.html'], + # file.component.html should be HTML, not Angular, see #13594 + html: ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'], htmlm4: ['file.html.m4'], httest: ['file.htt', 'file.htb'], hurl: ['file.hurl'], diff --git a/src/version.c b/src/version.c index 0de9c555dd..96691df617 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 555, +/**/ 554, /**/ 553, |