aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-02 19:43:39 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-02 19:44:37 -0400
commitcdd8540a20e2dbd2288b254a412ad8fa7d4bfbc8 (patch)
treeccfade98832d5f56f301a6b5128cc9f75a8e0660
parent24fb7eefaad1023938f43e8addb05d273b27323a (diff)
downloadrneovim-cdd8540a20e2dbd2288b254a412ad8fa7d4bfbc8.tar.gz
rneovim-cdd8540a20e2dbd2288b254a412ad8fa7d4bfbc8.tar.bz2
rneovim-cdd8540a20e2dbd2288b254a412ad8fa7d4bfbc8.zip
vim-patch:8.1.1187: cannot recognize Pipfile
Problem: Cannot recognize Pipfile. Solution: Use existing filetypes. (Charles Ross, closes vim/vim#4280) https://github.com/vim/vim/commit/3a4c53ba51c01b8fea68972453a71c55cf32edbe
-rw-r--r--runtime/filetype.vim7
-rw-r--r--src/nvim/testdir/test_filetype.vim4
2 files changed, 8 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 473c169061..6922565192 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1173,6 +1173,10 @@ au BufNewFile,BufRead *.rcp setf pilrc
" Pine config
au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex setf pine
+" Pipenv Pipfiles
+au BufNewFile,BufRead Pipfile setf config
+au BufNewFile,BufRead Pipfile.lock setf json
+
" PL/1, PL/I
au BufNewFile,BufRead *.pli,*.pl1 setf pli
@@ -1865,7 +1869,8 @@ au BufNewFile,BufRead *.xmi setf xml
au BufNewFile,BufRead *.csproj,*.csproj.user setf xml
" Qt Linguist translation source and Qt User Interface Files are XML
-au BufNewFile,BufRead *.ts,*.ui setf xml
+" However, for .ts Typescript is more common.
+au BufNewFile,BufRead *.ui setf xml
" TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)
au BufNewFile,BufRead *.tpm setf xml
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 897f736d76..779ee98316 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -102,7 +102,7 @@ let s:filename_checks = {
\ 'coco': ['file.atg'],
\ 'conaryrecipe': ['file.recipe'],
\ 'conf': ['auto.master'],
- \ 'config': ['configure.in', 'configure.ac'],
+ \ 'config': ['configure.in', 'configure.ac', 'Pipfile'],
\ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi'],
\ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
\ 'crm': ['file.crm'],
@@ -223,7 +223,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'],
- \ 'json': ['file.json', 'file.jsonp', 'file.webmanifest'],
+ \ 'json': ['file.json', 'file.jsonp', 'file.webmanifest', 'Pipfile.lock'],
\ 'jsp': ['file.jsp'],
\ 'kconfig': ['Kconfig', 'Kconfig.debug'],
\ 'kivy': ['file.kv'],