patch 9.0.2137: Can't detect angular & mustache filetypes

Problem:  Can't detect angular & mustache filetypes
Solution: Detect *.mustache as Mustache filetype;
          detect *.component.html as html.angular filetype

closes: #13594

Signed-off-by: ObserverOfTime <chronobserver@disroot.org>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7033daddea1dfc1935f75f5dfa2fd3c29f47c6cd..0317ccc9309e3a87fea40ef7b06f8319e0cb0b78 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -95,6 +95,9 @@ au BufNewFile,BufRead *.aidl                  setf aidl
 " AMPL
 au BufNewFile,BufRead *.run                    setf ampl
 
+" Angular in HTML
+au BufNewFile,BufRead *.component.html         setf html.angular
+
 " Ant
 au BufNewFile,BufRead build.xml                        setf ant
 
@@ -1397,6 +1400,9 @@ au BufRead,BufNewFile *.mu                        setf mupad
 " Mush
 au BufNewFile,BufRead *.mush                   setf mush
 
+" Mustache
+au BufNewFile,BufRead *.mustache               setf mustache
+
 " Mutt setup file (also for Muttng)
 au BufNewFile,BufRead Mutt{ng,}rc              setf muttrc
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9aa440318b33822f9ba6f14299a773bf7ef1d2e9..0de4c807a00506d2519034c7b5c1e37e0d7b4403 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -319,6 +319,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     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'],
     htmlm4: ['file.html.m4'],
     httest: ['file.htt', 'file.htb'],
     hurl: ['file.hurl'],
@@ -466,6 +467,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     mojo: ['file.mojo', 'file.🔥'],
     mupad: ['file.mu'],
     mush: ['file.mush'],
+    mustache: ['file.mustache'],
     muttrc: ['Muttngrc', 'Muttrc', '.muttngrc', '.muttngrc-file', '.muttrc',
              '.muttrc-file', '/.mutt/muttngrc', '/.mutt/muttngrc-file',
              '/.mutt/muttrc', '/.mutt/muttrc-file', '/.muttng/muttngrc',

diff --git a/src/version.c b/src/version.c
index f408e0beb3a1381cadbbad07d6305640285ac7d6..1476f981bd7a35e4bb08b6fddfe51345cff32b1b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2137,
 /**/
     2136,
 /**/