diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-22 13:00:10 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-22 13:30:38 -0500 |
| commit | e2a2efc4325219d889c59c91329695717ed970bc (patch) | |
| tree | 0ba15a0930f3fa546d8310a494c36259ffcab4f9 | |
| parent | 7dfeadb0fcbcedeafc357e60f0b7b2b8916afeaf (diff) | |
| download | rneovim-e2a2efc4325219d889c59c91329695717ed970bc.tar.gz rneovim-e2a2efc4325219d889c59c91329695717ed970bc.tar.bz2 rneovim-e2a2efc4325219d889c59c91329695717ed970bc.zip | |
vim-patch:8.2.2032: cabalconfig and cabalproject filetypes not recognized
Problem: Cabalconfig and cabalproject filetypes not recognized.
Solution: Detect more cabal files. (Marcin Szamotulski, closes vim/vim#7339)
https://github.com/vim/vim/commit/dcbab75db3ba5e812f119e08cda6a02c6b028a14
N/A patches for version.c:
vim-patch:8.1.1598: update to test file missing
Problem: Update to test file missing.
Solution: Update the popup window test file.
https://github.com/vim/vim/commit/53a95d65840e9d48844fa0798f198eca765176e8
vim-patch:8.1.1601: missing changes to popup window test file
Problem: Missing changes to popup window test file.
Solution: Add those changes.
https://github.com/vim/vim/commit/8da41816316f17382817df3f9449b55df8d39651
| -rw-r--r-- | runtime/filetype.vim | 15 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 4e617052a9..4e54bcaefd 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -692,12 +692,21 @@ au BufNewFile,BufRead .gtkrc,gtkrc setf gtkrc au BufNewFile,BufRead *.haml setf haml " Hamster Classic | Playground files -au BufNewFile,BufRead *.hsc,*.hsm setf hamster +au BufNewFile,BufRead *.hsm setf hamster +au BufNewFile,BufRead *.hsc + \ if match(join(getline(1,10), "\n"), '\%(^\|\n\)\s*\%({-#\_s*LANGUAGE\>\|\<module\>\)') != -1 | + \ setf haskell | + \ else | + \ setf hamster | + \ endif " Haskell au BufNewFile,BufRead *.hs,*.hs-boot setf haskell au BufNewFile,BufRead *.lhs setf lhaskell au BufNewFile,BufRead *.chs setf chaskell +au BufNewFile,BufRead cabal.project setf cabalproject +au BufNewFile,BufRead $HOME/.cabal/config setf cabalconfig +au BufNewFile,BufRead cabal.config setf cabalconfig " Haste au BufNewFile,BufRead *.ht setf haste @@ -2042,12 +2051,14 @@ au BufNewFile,BufRead bzr_log.* setf bzr " Bazel build file if !has("fname_case") - au BufNewFile,BufRead *.BUILD,BUILD setf bzl + au BufNewFile,BufRead *.BUILD,BUILD setf bzl endif " BIND zone au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone') +au BufNewFile,BufRead cabal.project.* call s:StarSetf('cabalproject') + " Calendar au BufNewFile,BufRead */.calendar/*, \*/share/calendar/*/calendar.*,*/share/calendar/calendar.* diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index af8482bdbe..ed75bda7a5 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -86,6 +86,8 @@ let s:filename_checks = { \ 'bzr': ['bzr_log.any'], \ 'c': ['enlightenment/file.cfg', 'file.qc', 'file.c'], \ 'cabal': ['file.cabal'], + \ 'cabalconfig': ['cabal.config'], + \ 'cabalproject': ['cabal.project', 'cabal.project.local'], \ 'calendar': ['calendar'], \ 'catalog': ['catalog', 'sgml.catalogfile'], \ 'cdl': ['file.cdl'], |