From 9fff99c3c28083dbe4dcb243309bf2b28c4cb82b Mon Sep 17 00:00:00 2001 From: Riley Bruins Date: Sun, 26 Oct 2025 20:00:03 +0000 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- .github/MAINTAINERS | 1 + runtime/autoload/dist/ft.vim | 2 ++ runtime/ftplugin/soy.vim | 14 ++++++++++++++ src/testdir/test_filetype.vim | 1 + src/version.c | 2 ++ 5 files changed, 20 insertions(+) create mode 100644 runtime/ftplugin/soy.vim diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS index bfd22e464e..d904e1c95a 100644 --- 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 6131cf5732..39ee2a94c9 100644 --- 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 index 0000000000..dcfe38895b --- /dev/null +++ b/runtime/ftplugin/soy.vim @@ -0,0 +1,14 @@ +" Vim filetype plugin +" Language: Soy (Closure Templates) +" Maintainer: Riley Bruins +" 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 4b10ccb63b..e3cc298bab 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -747,6 +747,7 @@ def s:GetFilenameChecks(): dict> 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 13aa6ec436..78860b861b 100644 --- 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, /**/ -- 2.47.3