Commit: patch 9.2.0849: filetype: osquery config files are not recognized
Christian Brabandt <[email protected]>
| Newsgroups | gmane.editors.vim.devel |
|---|---|
| Message-ID | <[email protected]> |
patch 9.2.0849: filetype: osquery config files are not recognized Commit: https://github.com/vim/vim/commit/ea183ce4e5fb82d389e71f5de8f7564ee399d49c Author: Fionn Fitzmaurice <[email protected]> Date: Fri Jul 24 20:11:25 2026 +0000 patch 9.2.0849: filetype: osquery config files are not recognized Problem: filetype: osquery config files are not recognized. Solution: Detect osquery.conf as jsonc filetype (Fionn Fitzmaurice). Reference: https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-components closes: #20826 Signed-off-by: Fionn Fitzmaurice <[email protected]> Signed-off-by: Christian Brabandt <[email protected]> diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 25414c490..5b4264aeb 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -3,7 +3,7 @@ vim9script # Vim functions for file type detection # # Maintainer: The Vim Project <https://github.com/vim/vim> -# Last Change: 2026 Jul 22 +# Last Change: 2026 Jul 24 # Former Maintainer: Bram Moolenaar <[email protected]> # These functions are moved here from runtime/filetype.vim to make startup @@ -3315,6 +3315,8 @@ const ft_from_name = { ".swcrc": "json", "composer.lock": "json", "symfony.lock": "json", + # osquery configuration + "osquery.conf": "jsonc", # Kconfig "Kconfig": "kconfig", "Kconfig.debug": "kconfig", diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 4c03d5f50..075430ae5 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -429,7 +429,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', 'composer.lock', 'symfony.lock'], 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"), '/home/user/.config/waybar/config' ], + jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.jscsrc', '.vsconfig', '.hintrc', '.swrc', 'jsconfig.json', 'osquery.conf', '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 2cf1ab942..296346f33 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 849, /**/ 848, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1wnMWz-00C77x-9R%40256bit.org.