From 3c929fd1c2e0fd0f385f2cb82bd33145a7dd6a72 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 9 Aug 2023 22:35:57 +0200 Subject: vim-patch:077ade4f6703 (#24629) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: recognize geojson extension as json filetype (vim/vim#12636) https://github.com/vim/vim/commit/077ade4f67036e652b99f8f858c9ca1c1dd22245 Co-authored-by: Dominique Pellé --- runtime/lua/vim/filetype.lua | 1 + test/old/testdir/test_filetype.vim | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 98938ddbf3..dd730c0744 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -548,6 +548,7 @@ local extension = { slnf = 'json', json = 'json', jsonp = 'json', + geojson = 'json', webmanifest = 'json', ipynb = 'json', ['json-patch'] = 'json', diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim index ba18d98814..e733526d18 100644 --- a/test/old/testdir/test_filetype.vim +++ b/test/old/testdir/test_filetype.vim @@ -330,7 +330,7 @@ func s:GetFilenameChecks() abort \ 'jq': ['file.jq'], \ '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'], - \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'], + \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'], \ 'json5': ['file.json5'], \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'], \ 'jsonl': ['file.jsonl'], -- cgit