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: #15190
related: #13594
related: #13604

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-07-10 19:23:39 +02:00
parent 4ff3a9b1e3
commit c03f631b7b
3 changed files with 9 additions and 6 deletions

View File

@ -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

View File

@ -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'],

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
555,
/**/
554,
/**/