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: #17915

Signed-off-by: Furkan Sahin <furkan-dev@proton.me>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 59b2426e8ec269175846646385bb54b774c12576..406b93d031d772eb8d7d5c8f479b981e45193d18 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2882,6 +2882,9 @@ au BufNewFile,BufRead *.vroom                     setf vroom
 " Vue.js Single File Component
 au BufNewFile,BufRead *.vue                    setf vue
 
+" Waybar config
+au BufNewFile,BufRead */waybar/config          setf jsonc
+
 " WebAssembly
 au BufNewFile,BufRead *.wat,*.wast             setf wat
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8aab4706421ed01f874b03577b60589764fa8cea..7c5962cd9e8b195e1edb005986cae3632331eb20 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -406,7 +406,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     '.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'],

diff --git a/src/version.c b/src/version.c
index a08261bf4967675d913ae097eb23b0fcb343ce6e..ff47328d42840a2352bd341833cda4c9b06d4aa8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1598,
 /**/
     1597,
 /**/