commit 1f7ab25915f179a0d29200a10a1be71c54d22659
parent 7dbf347dda0bfef543e2189730c34c37bf874e25
Author: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 7 Aug 2025 15:16:56 +0200
vim-patch:9.1.1598: filetype: waybar config file is not recognized
Problem: filetype: waybar config file is not recognized
Solution: Detect */waybar/config file as jsonc filetype
(Furkan Sahin)
closes: vim/vim#17915
https://github.com/vim/vim/commit/a6e28b1d0508e499844d289aa00773fe9cb5503b
Co-authored-by: Furkan Sahin <furkan-dev@proton.me>
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
@@ -2220,6 +2220,7 @@ local pattern = {
['/gitolite%-admin/conf/'] = starsetf('gitolite'),
['/%.i3/config$'] = 'i3config',
['/i3/config$'] = 'i3config',
+ ['/waybar/config$'] = 'jsonc',
['/%.mplayer/config$'] = 'mplayerconf',
['/supertux2/config$'] = 'scheme',
['/neofetch/config%.conf$'] = 'sh',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
@@ -403,7 +403,7 @@ func s:GetFilenameChecks() abort
\ 'jq': ['file.jq'],
\ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', 'file.jupyterlab-settings', '.prettierrc', '.firebaserc', '.stylelintrc', '.lintstagedrc', 'file.slnf', 'file.sublime-project', 'file.sublime-settings', 'file.sublime-workspace', 'file.bd', 'file.bda', 'file.xci', 'flake.lock', 'pack.mcmeta', 'deno.lock', '.swcrc'],
\ 'json5': ['file.json5'],
- \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.jscsrc', '.vsconfig', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json', '.luaurc', 'bun.lock', expand("$HOME/.config/VSCodium/User/settings.json")],
+ \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.jscsrc', '.vsconfig', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json', '.luaurc', 'bun.lock', expand("$HOME/.config/VSCodium/User/settings.json"), '/home/user/.config/waybar/config'],
\ 'jsonl': ['file.jsonl'],
\ 'jsonnet': ['file.jsonnet', 'file.libsonnet'],
\ 'jsp': ['file.jsp'],