patch 8.2.1566: not all Bazel files are recognized

Problem:    Not all Bazel files are recognized.
Solution:   Add *.bazel and *.BUILD. (closes #6836)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ae6dc6f1d3d6c16dda13d84423819245c85c43d8..5d4d77609a45409f65fc8fccf9973e63eaea3b15 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -240,10 +240,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
@@ -2042,7 +2042,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 6957954a6e8aabe338e41151582c2777a8693988..5d37a866f20455207712cbce0b30f1b3277cd102 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/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'],
@@ -527,6 +528,7 @@ let s:filename_checks = {
 
 let s:filename_case_checks = {
     \ 'modula2': ['file.DEF', 'file.MOD'],
+    \ 'bzl': ['file.BUILD', 'BUILD'],
     \ }
 
 func CheckItems(checks)

diff --git a/src/version.c b/src/version.c
index bbbb26e311f4d06e12e5647cc154f10f1e51dee2..b75c9fbc65d46d385210724b9506028a0ddb8336 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1566,
 /**/
     1565,
 /**/