Skip to content

Commit aae85fe

Browse files
committed
Merge branch 'master' of https://github.com/sheerun/vim-polyglot
2 parents a4f98d2 + 55eed00 commit aae85fe

File tree

5 files changed

+32
-13
lines changed

5 files changed

+32
-13
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A collection of language packs for Vim.
1111
> One to rule them all, one to find them, one to bring them all and in the darkness bind them.
1212
1313
- It **won't affect your startup time**, as scripts are loaded only on demand\*.
14-
- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
14+
- It **installs and updates 120+ times faster** than the <!--Package Count-->599<!--/Package Count--> packages it consists of.
1515
- It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
1616
- Best syntax and indentation support (no other features). Hand-selected language packs.
1717
- Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -55,6 +55,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
5555
- [arduino](https://github.com/sudar/vim-arduino-syntax) (Processing syntax highlighting for pde and ino files)
5656
- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (AsciiDoc syntax highlighting for asciidoc, adoc and asc files)
5757
- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (AutoHotkey syntax highlighting for ahk and ahkl files)
58+
- [bicep](https://github.com/carlsmedstad/vim-bicep) (Syntax highlighting for bicep files)
5859
- [blade](https://github.com/jwalton512/vim-blade) (Blade syntax highlighting for blade and blade.php files)
5960
- [brewfile](https://github.com/bfontaine/Brewfile.vim)
6061
- [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting for cpp, c++, cc, cp, cxx and 18 more files)

autoload/polyglot/init.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3510,7 +3510,7 @@ au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
35103510
au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
35113511

35123512
" Shell scripts ending in a star
3513-
au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
3513+
au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
35143514
au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
35153515
au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
35163516

extras/filetype.vim

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,17 +2506,20 @@ endif
25062506
" Function called for testing all functions defined here. These are
25072507
" script-local, thus need to be executed here.
25082508
" Returns a string with error messages (hopefully empty).
2509-
func! TestFiletypeFuncs(testlist)
2510-
let output = ''
2511-
for f in a:testlist
2512-
try
2513-
exe f
2514-
catch
2515-
let output = output . "\n" . f . ": " . v:exception
2516-
endtry
2517-
endfor
2518-
return output
2519-
endfunc
2509+
" Check if function exists first. See https://github.com/vim/vim/issues/9890
2510+
if !exists("*TestFiletypeFuncs")
2511+
func! TestFiletypeFuncs(testlist)
2512+
let output = ''
2513+
for f in a:testlist
2514+
try
2515+
exe f
2516+
catch
2517+
let output = output . "\n" . f . ": " . v:exception
2518+
endtry
2519+
endfor
2520+
return output
2521+
endfunc
2522+
endif
25202523

25212524
" Restore 'cpoptions'
25222525
let &cpo = s:cpo_save

packages.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,12 @@ filetypes:
686686
- name: gomod
687687
filenames:
688688
- go.mod
689+
- name: gosum
690+
filenames:
691+
- go.sum
692+
- name: gowork
693+
filenames:
694+
- go.work
689695
- name: gohtmltmpl
690696
extensions:
691697
- tmpl
@@ -5546,3 +5552,11 @@ name: zinit
55465552
remote: zdharma-continuum/zinit-vim-syntax@main
55475553
# just adds to zsh filetype
55485554
filetypes: []
5555+
---
5556+
name: bicep
5557+
remote: carlsmedstad/vim-bicep
5558+
filetypes:
5559+
- name: bicep
5560+
patterns:
5561+
- pattern: '*.bicep'
5562+
description: Microsoft Bicep

tests/filetypes.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@ call TestFiletype('nftables')
646646
call TestFiletype('openscad')
647647
call TestFiletype('mermaid')
648648
call TestFiletype('org')
649+
call TestFiletype('bicep')
649650

650651
" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
651652

0 commit comments

Comments
 (0)