aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-09-02 20:49:12 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-09-02 21:59:36 -0400
commitb9430fe28ef8c5a865b3bee5c7f523abc3b1947a (patch)
tree7e1a150ceb2839512775aed2808b63eafd2387d3
parent4bcca0baa9a1100104935868ffc57e14d168deed (diff)
downloadrneovim-b9430fe28ef8c5a865b3bee5c7f523abc3b1947a.tar.gz
rneovim-b9430fe28ef8c5a865b3bee5c7f523abc3b1947a.tar.bz2
rneovim-b9430fe28ef8c5a865b3bee5c7f523abc3b1947a.zip
vim-patch:8.2.1566: not all Bazel files are recognized
Problem: Not all Bazel files are recognized. Solution: Add *.bazel and *.BUILD. (closes vim/vim#6836) https://github.com/vim/vim/commit/4488f5a545691ca4c8802bad0d70a5e750fc8844
-rw-r--r--runtime/filetype.vim6
-rw-r--r--src/nvim/testdir/test_filetype.vim2
2 files changed, 5 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 41a9188905..32bd6daba0 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -236,10 +236,10 @@ au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml
au BufNewFile,BufRead *bsd,*.bsdl setf bsdl
" Bazel (http://bazel.io)
-autocmd BufRead,BufNewFile *.bzl,WORKSPACE,BUILD.bazel setf bzl
+autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE setf bzl
if has("fname_case")
" There is another check for BUILD further below.
- autocmd BufRead,BufNewFile BUILD setf bzl
+ autocmd BufRead,BufNewFile *.BUILD,BUILD setf bzl
endif
" C or lpc
@@ -2041,7 +2041,7 @@ au BufNewFile,BufRead bzr_log.* setf bzr
" Bazel build file
if !has("fname_case")
- au BufNewFile,BufRead BUILD setf bzl
+ au BufNewFile,BufRead *.BUILD,BUILD setf bzl
endif
" BIND zone
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 529f237a97..617e3dfe41 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -75,6 +75,7 @@ let s:filename_checks = {
\ 'ave': ['file.ave'],
\ 'awk': ['file.awk', 'file.gawk'],
\ 'b': ['file.mch', 'file.ref', 'file.imp'],
+ \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
\ 'bc': ['file.bc'],
\ 'bdf': ['file.bdf'],
\ 'bib': ['file.bib'],
@@ -526,6 +527,7 @@ let s:filename_checks = {
let s:filename_case_checks = {
\ 'modula2': ['file.DEF', 'file.MOD'],
+ \ 'bzl': ['file.BUILD', 'BUILD'],
\ }
func CheckItems(checks)