patch 9.1.1878: filetype: Soy files are not recognized

Problem:  filetype: Soy files are not recognized
Solution: Detect *.soy files as soy filetype,
          include a soy filetype plugin (Riley Bruins)

closes: #18640

Signed-off-by: Riley Bruins <ribru17@hotmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index bfd22e464e9620e4de43bdd68a3fbcfb1fbee2bd..d904e1c95ae36338f59b40ac78363f8572f61d10 100644 (file)
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -289,6 +289,7 @@ runtime/ftplugin/slint.vim                          @ribru17
 runtime/ftplugin/snakemake.vim                         @ribru17
 runtime/ftplugin/solidity.vim                          @coti-z
 runtime/ftplugin/solution.vim                          @dkearns
+runtime/ftplugin/soy.vim                               @ribru17
 runtime/ftplugin/spajson.vim                           @dseomn
 runtime/ftplugin/spec.vim                              @ignatenkobrain
 runtime/ftplugin/squirrel.vim                          @ribru17

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 6131cf5732f0a4d161018c62266a4212257d1772..39ee2a94c9b7b35dedafa995bfc8deefdf072d72 100644 (file)
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -2714,6 +2714,8 @@ const ft_from_ext = {
   "hlp": "smcl",
   "ihlp": "smcl",
   "smcl": "smcl",
+  # Soy
+  "soy": "soy",
   # Stored Procedures
   "stp": "stp",
   # Standard ML

diff --git a/runtime/ftplugin/soy.vim b/runtime/ftplugin/soy.vim
new file mode 100644 (file)
index 0000000..dcfe388
--- /dev/null
+++ b/runtime/ftplugin/soy.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin
+" Language:    Soy (Closure Templates)
+" Maintainer:  Riley Bruins <ribru17@gmail.com>
+" Last Change: 2025 Oct 24
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setlocal comments< commentstring<"

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4b10ccb63bf867ae7af86f0111900c841512e212..e3cc298bab09eda3966fae0a173491b19236664f 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -747,6 +747,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     snobol4: ['file.sno', 'file.spt'],
     solidity: ['file.sol'],
     solution: ['file.sln'],
+    soy: ['file.soy'],
     spajson: ['any/pipewire/file.conf', 'any/pipewire/file.conf.d/other.conf',
               'any/wireplumber/file.conf', 'any/wireplumber/file.conf.d/other.conf'],
     sparql: ['file.rq', 'file.sparql'],

diff --git a/src/version.c b/src/version.c
index 13aa6ec436a73106007cf791230a6d2ebda8492b..78860b861b5b35b82dbc3c47d237cba76a03e745 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1878,
 /**/
     1877,
 /**/