patch 9.1.0826: filetype: sway files are not recognized

Problem:  filetype: sway files are not recognized
Solution: detect '*.sw' files as sway filetype, include
          a filetype plugin (Riley Bruins)

References:
 https://github.com/FuelLabs/sway.

Comments taken from their syntax documentation. File extension taken
from the same documentation/GitHub's own recognition of these file types

closes: #15973

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 e24fbc4c8ca86d7011144abde826ca5824bd116d..ea342ef7a0ff7b82408db13b37e71cc7f917f64b 100644 (file)
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -263,6 +263,7 @@ runtime/ftplugin/squirrel.vim               @ribru17
 runtime/ftplugin/ssa.vim               @ObserverOfTime
 runtime/ftplugin/sshdconfig.vim                @jiangyinzuo
 runtime/ftplugin/svelte.vim            @igorlfs
+runtime/ftplugin/sway.vim              @ribru17
 runtime/ftplugin/swayconfig.vim                @jamespeapen
 runtime/ftplugin/systemverilog.vim     @Kocha
 runtime/ftplugin/swig.vim              @jmarrec

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7b0014d7640e2417bf1fee0ca20668bc103efd5b..36461f69f8f16d1a863a7557a3352dd07223cca0 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2430,6 +2430,9 @@ au BufNewFile,BufRead *.sml                       setf sml
 " Sratus VOS command macro
 au BufNewFile,BufRead *.cm                     setf voscm
 
+" Sway (programming language)
+au BufNewFile,BufRead *.sw                     setf sway
+
 " Swift
 au BufNewFile,BufRead *.swift,*.swiftinterface setf swift
 au BufNewFile,BufRead *.swift.gyb              setf swiftgyb

diff --git a/runtime/ftplugin/sway.vim b/runtime/ftplugin/sway.vim
new file mode 100644 (file)
index 0000000..35970b2
--- /dev/null
+++ b/runtime/ftplugin/sway.vim
@@ -0,0 +1,15 @@
+" Vim filetype plugin
+" Language:    Sway
+" Maintainer:  Riley Bruins <ribru17@gmail.com>
+" Last Change: 2024 Nov 01
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl commentstring=//\ %s
+" From Rust comments
+setl comments=s0:/*!,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,://
+
+let b:undo_ftplugin = 'setl com< cms<'

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 777f908fcbf753e92545672f74e1f77c2ebd295e..050ff5f39194e6e0aeef82dee45266d31a725bcb 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -729,6 +729,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     svelte: ['file.svelte'],
     svg: ['file.svg'],
     svn: ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
+    sway: ['file.sw'],
     swayconfig: ['/home/user/.sway/config', '/home/user/.config/sway/config', '/etc/sway/config', '/etc/xdg/sway/config'],
     swift: ['file.swift', 'file.swiftinterface'],
     swiftgyb: ['file.swift.gyb'],

diff --git a/src/version.c b/src/version.c
index 891327afdde589478b4eea7a68d2820dce5c47d4..493de72f683ef483c0faa4cbe7557b525aeae6f3 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 */
+/**/
+    826,
 /**/
     825,
 /**/