diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-02 17:08:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-02 17:08:59 +0200 |
| commit | 4488f5a545691ca4c8802bad0d70a5e750fc8844 (patch) | |
| tree | 3aaa87fc950215539e63a935edc666cb882e4301 | |
| parent | e90d63ea904187ecbb09d0f7f21b71b302b30644 (diff) | |
| download | vim-git-4488f5a545691ca4c8802bad0d70a5e750fc8844.tar.gz | |
patch 8.2.1566: not all Bazel files are recognizedv8.2.1566
Problem: Not all Bazel files are recognized.
Solution: Add *.bazel and *.BUILD. (closes #6836)
| -rw-r--r-- | runtime/filetype.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ae6dc6f1d..5d4d77609 100644 --- 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 6957954a6..5d37a866f 100644 --- 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 bbbb26e31..b75c9fbc6 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1566, +/**/ 1565, /**/ 1564, |