django templates are being detected as htmlangular

[CraziestOwl]

Steps to reproduce

The file type is identified incorrectly as htmlangular, if there is a line containing {{ }} before an line with {% %}:
For example:

<title>{{ title }}</title>
{% block content %}
<h1>{% if user.is_authenticated %}Hello, {{ user.username }}.{% endif %}</h1> 
{% endblock %}

If the order is line with {% %} but without {{ }} first and then {{ }} the file type will be identified correctly as htmldjango.

Expected behaviour

The file type to be htmldjango

Version of Vim

9.1.984

Environment

OS: Debian 12
terminal: konsole 23.08.5
shell: bash 5.2.15

Logs and stack traces

No response

[CraziestOwl]

Removing {{.*}} from

# runtime/autoload/dist/ft.vim
    # Check for Angular
    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content\|{{.*}}'
      setf htmlangular

solved the issue for me, but I don't know if this alone is a good solution, as I'm not familiar with angular.

[chrisbra]

This comes from this commit: 1ad194c
ping @dlvandenberg perhaps he can comment on the suggested solution?

[dlvandenberg]

It is possible for an Angular template to contain only string interpolation blocks {{ ... }}.. but I guess the same goes for Django Templates. I'm not sure how to approach this. If you remove the check for Angular, then I guess Angular Templates will be marked as Django Templates if they contain {{ .* }}..

[CraziestOwl]

@dlvandenberg
From what I saw the Django Templates check does not include {{ .* }}.

I forget to mention, that this also interferes with go templates.

I feel that {{ .* }} is too broad for the html file type check.

[dlvandenberg]

Ah, I see. Perhaps its best to remove it then. Angular has a convention that the file format is *.component.html. Users can create a ftplugin for that pattern to mark the ft as htmlangular.

But, if the template only contains {{ .* }} you would not have that much Angular specific highlighting to do anyway, I guess.

[CraziestOwl]

I agree. I wasn't sure if it had any uses beyond string interpolation in Angular, so I was hesitant about suggesting to completely removing it.
Thanks for the insight =)

[chrisbra]

So did I understand, that this should be fine then?

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index ce7f44fa6..f7e511f7a 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -433,7 +433,7 @@ export def FThtml()

   while n < 40 && n <= line("$")
     # Check for Angular
-    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content\|{{.*}}'
+    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content'
       setf htmlangular
       return
     endif

[CraziestOwl]

Thank you both