IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1082: some jsonc files are not recognized (#21483)

Browse Source 
Problem:    Some jsonc files are not recognized.
Solution:   Add patterns for jsonc and move some from json to jsonc.
            (closes vim/vim#11711)

104b2ff4d0

Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com>
This commit is contained in:
kylo252 2022-12-20 18:04:47 +01:00 committed by GitHub
parent f04087d8ba
commit 45d1b1c678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1454,11 +1454,15 @@ local filename = {
['ipf.conf'] = 'ipfilter', ['ipf.conf'] = 'ipfilter',
['ipf6.conf'] = 'ipfilter', ['ipf6.conf'] = 'ipfilter',
['ipf.rules'] = 'ipfilter', ['ipf.rules'] = 'ipfilter',
['.eslintrc'] = 'json',
['.babelrc'] = 'json',
['Pipfile.lock'] = 'json', ['Pipfile.lock'] = 'json',
['.firebaserc'] = 'json', ['.firebaserc'] = 'json',
['.prettierrc'] = 'json', ['.prettierrc'] = 'json',
['.babelrc'] = 'jsonc',
['.eslintrc'] = 'jsonc',
['.hintrc'] = 'jsonc',
['.jsfmtrc'] = 'jsonc',
['.jshintrc'] = 'jsonc',
['.swrc'] = 'jsonc',
Kconfig = 'kconfig', Kconfig = 'kconfig',
['Kconfig.debug'] = 'kconfig', ['Kconfig.debug'] = 'kconfig',
['lftp.conf'] = 'lftp', ['lftp.conf'] = 'lftp',
@ -1912,6 +1916,7 @@ local pattern = {
['.*%.properties_.._..'] = 'jproperties', ['.*%.properties_.._..'] = 'jproperties',
['org%.eclipse%..*%.prefs'] = 'jproperties', ['org%.eclipse%..*%.prefs'] = 'jproperties',
['.*%.properties_.._.._.*'] = starsetf('jproperties'), ['.*%.properties_.._.._.*'] = starsetf('jproperties'),
['[jt]sconfig.*%.json'] = 'jsonc',
['Kconfig%..*'] = starsetf('kconfig'), ['Kconfig%..*'] = starsetf('kconfig'),
['.*%.[Ss][Uu][Bb]'] = 'krl', ['.*%.[Ss][Uu][Bb]'] = 'krl',
['lilo%.conf.*'] = starsetf('lilo'), ['lilo%.conf.*'] = starsetf('lilo'),

4
src/nvim/testdir/test_filetype.vim
View File

@ -289,9 +289,9 @@ let s:filename_checks = {
\ 'jgraph': ['file.jgr'], \ 'jgraph': ['file.jgr'],
\ 'jovial': ['file.jov', 'file.j73', 'file.jovial'], \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'],
\ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'], \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
\ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'], \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', 'file.slnf'],
\ 'json5': ['file.json5'], \ 'json5': ['file.json5'],
\ 'jsonc': ['file.jsonc'], \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
\ 'jsonnet': ['file.jsonnet', 'file.libsonnet'], \ 'jsonnet': ['file.jsonnet', 'file.libsonnet'],
\ 'jsp': ['file.jsp'], \ 'jsp': ['file.jsp'],
\ 'julia': ['file.jl'], \ 'julia': ['file.jl'],