aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2021-12-15 16:10:03 +0100
committerGitHub <noreply@github.com>2021-12-15 16:10:03 +0100
commitcf65071e2ef6defcb7125daddf09fc4a52cc85cd (patch)
tree2069d4f48282ea56a4d77cb2ce595350676c4f47
parent576408ddde2f669f8a4a5e6782739f89edda4629 (diff)
downloadrneovim-cf65071e2ef6defcb7125daddf09fc4a52cc85cd.tar.gz
rneovim-cf65071e2ef6defcb7125daddf09fc4a52cc85cd.tar.bz2
rneovim-cf65071e2ef6defcb7125daddf09fc4a52cc85cd.zip
vim-patch:8.2.3814: .csx files and .sln files are not recognized (#16662)
Problem: .csx files and .sln files are not recognized. Solution: Add filetype patterns. (Doug Kearns) https://github.com/vim/vim/commit/cfabad9bcf45650dee1f1f41ec4047f82a12f323
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/nvim/testdir/test_filetype.vim3
2 files changed, 6 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b93263eb6d..806748b7cb 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -256,7 +256,7 @@ au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
au BufNewFile,BufRead calendar setf calendar
" C#
-au BufNewFile,BufRead *.cs setf cs
+au BufNewFile,BufRead *.cs,*.csx setf cs
" CSDL
au BufNewFile,BufRead *.csdl setf csdl
@@ -1739,6 +1739,9 @@ au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup
" Slice
au BufNewFile,BufRead *.ice setf slice
+" Microsoft Visual Studio Solution
+au BufNewFile,BufRead *.sln setf solution
+
" 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 5d77db6c21..7ed9c68c96 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -117,7 +117,7 @@ let s:filename_checks = {
\ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
\ 'crm': ['file.crm'],
\ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'],
- \ 'cs': ['file.cs'],
+ \ 'cs': ['file.cs', 'file.csx'],
\ 'csc': ['file.csc'],
\ 'csdl': ['file.csdl'],
\ 'csp': ['file.csp', 'file.fdr'],
@@ -456,6 +456,7 @@ let s:filename_checks = {
\ 'skill': ['file.il', 'file.ils', 'file.cdf'],
\ 'slang': ['file.sl'],
\ 'slice': ['file.ice'],
+ \ 'solution': ['file.sln'],
\ 'slpconf': ['/etc/slp.conf', 'any/etc/slp.conf'],
\ 'slpreg': ['/etc/slp.reg', 'any/etc/slp.reg'],
\ 'slpspi': ['/etc/slp.spi', 'any/etc/slp.spi'],