From d7060183b89742bdb89537beb06201faf05f2fef Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 3 Jul 2021 22:55:09 -0400 Subject: [PATCH] vim-patch:8.2.3085: JSONC files are not recognized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: JSONC files are not recognized. Solution: Recognize .jsonc files. (Izhak Jakov, closes vim/vim#8500) https://github.com/vim/vim/commit/acbb4b5720fc27b8b07357b763ed4e5a944ae1da N/A patches for version.c: vim-patch:8.2.3081: cannot catch errors in a channel command Problem: Cannot catch errors in a channel command. Solution: Instead of skipping the error make it silent. (closes vim/vim#8477) https://github.com/vim/vim/commit/11a632d60bde616feb298d180108819ebb1d04a0 vim-patch:8.2.3082: a channel command "echoerr" does not show anything Problem: A channel command "echoerr" does not show anything. Solution: Do not use silent errors when using an "echoerr" command. (closes vim/vim#8494) https://github.com/vim/vim/commit/b836f631dba2534efd314a8f77439cebc75acd4e vim-patch:8.2.3094: Test_popup_atcursor_pos() fails without the conceal feature Problem: Test_popup_atcursor_pos() fails without the conceal feature. Solution: Add a check for the conceal feature. (Dominique Pellé, closes vim/vim#8505) https://github.com/vim/vim/commit/c60e959cba03fae9cff9b2674fab646cc70819fc vim-patch:8.2.3098: popup window test is flaky on MS-Windows with GUI Problem: Popup window test is flaky on MS-Windows with GUI. Solution: Skip the check in this situation. https://github.com/vim/vim/commit/999db2346b61e6f6e6fde2d0b56f4646a46b727d --- runtime/filetype.vim | 3 +++ src/nvim/testdir/test_filetype.vim | 1 + 2 files changed, 4 insertions(+) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 2617d8ffc0..981515081e 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -864,6 +864,9 @@ au BufNewFile,BufRead *.json-patch setf json " Jupyter Notebook is also json au BufNewFile,BufRead *.ipynb setf json +" JSONC +au BufNewFile,BufRead *.jsonc setf jsonc + " Kixtart au BufNewFile,BufRead *.kix setf kix diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index eb6151fbe1..591dc251ed 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -260,6 +260,7 @@ let s:filename_checks = { \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'], \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file'], \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb'], + \ 'jsonc': ['file.jsonc'], \ 'jsp': ['file.jsp'], \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'], \ 'kivy': ['file.kv'],