aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-11-02 16:09:23 +0100
committerChristian Clason <ch.clason+github@icloud.com>2024-11-02 23:33:38 +0100
commitdb46b58569bc518967b73bf7d6ed92f8f5548c90 (patch)
treeccdfc1f74c72e483041db7fca228540b1c3f27a2
parentf5933d196b419901f96b0516b5039f3862eee27c (diff)
downloadrneovim-db46b58569bc518967b73bf7d6ed92f8f5548c90.tar.gz
rneovim-db46b58569bc518967b73bf7d6ed92f8f5548c90.tar.bz2
rneovim-db46b58569bc518967b73bf7d6ed92f8f5548c90.zip
vim-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: vim/vim#15973 https://github.com/vim/vim/commit/84b5b1c660beb2f9e27de70687e41d39a023ae81 Co-authored-by: Riley Bruins <ribru17@hotmail.com>
-rw-r--r--runtime/ftplugin/sway.vim15
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim1
3 files changed, 17 insertions, 0 deletions
diff --git a/runtime/ftplugin/sway.vim b/runtime/ftplugin/sway.vim
new file mode 100644
index 0000000000..35970b257c
--- /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/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index f6928c6428..057a99123b 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1151,6 +1151,7 @@ local extension = {
sface = 'surface',
svelte = 'svelte',
svg = 'svg',
+ sw = 'sway',
swift = 'swift',
swiftinterface = 'swift',
swig = 'swig',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 6fc9f8e65c..a1e0b4043f 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -726,6 +726,7 @@ func s:GetFilenameChecks() abort
\ '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'],