aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2021-12-26 00:26:27 +0100
committerGitHub <noreply@github.com>2021-12-25 18:26:27 -0500
commit19ec20700b654754c2bfd9c0b25e041f0758ab40 (patch)
tree0d825dfecd0baef19f63c9d0f334be7431f15bc9
parentf7d840e295ad8516a9f793fefd0c232a777e65a7 (diff)
downloadrneovim-19ec20700b654754c2bfd9c0b25e041f0758ab40.tar.gz
rneovim-19ec20700b654754c2bfd9c0b25e041f0758ab40.tar.bz2
rneovim-19ec20700b654754c2bfd9c0b25e041f0758ab40.zip
vim-patch:8.2.3880: Solution filter files are not recognized (#16779)
Problem: Solution filter files are not recognized. Solution: Add pattern *.slnf and use json. (Doug Kearns) https://github.com/vim/vim/commit/70a120b72b2b48800f881725c58241cd170893f8
-rw-r--r--runtime/filetype.vim1
-rw-r--r--src/nvim/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 8a705abd1c..2eeddbfb83 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1746,6 +1746,7 @@ au BufNewFile,BufRead *.ice setf slice
" Microsoft Visual Studio Solution
au BufNewFile,BufRead *.sln setf solution
+au BufNewFile,BufRead *.slnf setf json
" Spice
au BufNewFile,BufRead *.sp,*.spice setf spice
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index dba7226119..1ee23bb646 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -263,7 +263,7 @@ let s:filename_checks = {
\ 'jgraph': ['file.jgr'],
\ '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', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc'],
+ \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'],
\ 'jsonc': ['file.jsonc'],
\ 'jsp': ['file.jsp'],
\ 'julia': ['file.jl'],