mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1787: filetype: not all Sway config files are recognized

Browse Source 
Problem:  filetype: not all Sway config files are recognized
Solution: Detect files within */sway/config.d/* as swayconfig filetype
          (Felix Pehla).

Sways default config automatically includes files placed in
@sysconfdir@/sway/config.d/* (see config.in), so it makes sense to use
the sway syntax for those.

related: vim/vim#18293

24f0dbba8c

Co-authored-by: Felix Pehla <29adc1fd92@gmail.com>
This commit is contained in:
zeertzjq
2025-09-24 08:33:47 +08:00
parent 409122e5ae
commit 0c23b863f4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/lua/vim/filetype.lua
View File

@@ -2388,6 +2388,7 @@ local pattern = {
['/%.ssh/config$'] = 'sshconfig', ['/%.ssh/config$'] = 'sshconfig',
['/%.sway/config$'] = 'swayconfig', ['/%.sway/config$'] = 'swayconfig',
['/sway/config$'] = 'swayconfig', ['/sway/config$'] = 'swayconfig',
['/sway/config%.d/'] = 'swayconfig',
['/%.cargo/config$'] = 'toml', ['/%.cargo/config$'] = 'toml',
['/%.bundle/config$'] = 'yaml', ['/%.bundle/config$'] = 'yaml',
['/%.kube/config$'] = 'yaml', ['/%.kube/config$'] = 'yaml',

3
test/old/testdir/test_filetype.vim
View File

@@ -772,7 +772,8 @@ func s:GetFilenameChecks() abort
\ 'svg': ['file.svg'], \ 'svg': ['file.svg'],
\ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'], \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
\ 'sway': ['file.sw'], \ 'sway': ['file.sw'],
\ 'swayconfig': ['/home/user/.sway/config', '/home/user/.config/sway/config', '/etc/sway/config', '/etc/xdg/sway/config'], \ 'swayconfig': ['/home/user/.sway/config', '/home/user/.config/sway/config', '/etc/sway/config', '/etc/xdg/sway/config',
\ '/home/user/sway/config.d/50-user.conf' ],
\ 'swift': ['file.swift', 'file.swiftinterface'], \ 'swift': ['file.swift', 'file.swiftinterface'],
\ 'swiftgyb': ['file.swift.gyb'], \ 'swiftgyb': ['file.swift.gyb'],
\ 'swig': ['file.swg', 'file.swig'], \ 'swig': ['file.swg', 'file.swig'],