MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-05 13:14:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: contrib: vim: ftdetect: don't conflict with other filetypes

Browse Source 
Use :setfiletype instead of :set filetype. The former only sets the
'filetype' option if it has not been set before, which makes it possible
to override the syntax of certain *.inc files in autocommands from e.g.
.vimrc or modelines. All other ftdetect plugins in upstream vim also use
:setfiletype for this reason.

The detection for bitbake *.inc files is now upstream since Vim 9.0
patch 0055 [1]. If we're running an earlier Vim, use the detection
heuristic from upstream [2] to overwrite the filetype explicitely if we
find bitbake code. But don't always assuming that *.inc files are
bitbake files so as not to break Perl, PHP, Assembly, Povray, etc.

[1]: https://github.com/vim/vim/commit/fa49eb482729
[2]: https://github.com/vim/vim/blob/fb49e3cde79d/runtime/autoload/dist/ft.vim#L715

(Bitbake rev: e8efbba5d7bb4b685ed0a9b970e042ad99be8afb)

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Roland Hieber 2025-03-03 13:55:02 +01:00 committed by Richard Purdie
parent 8ed26544f9
commit fec201518b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitbake/contrib/vim/ftdetect/bitbake.vim
View File

@ -11,10 +11,18 @@ if &compatible || version < 600 || exists("b:loaded_bitbake_plugin")
endif endif
" .bb, .bbappend and .bbclass " .bb, .bbappend and .bbclass
au BufNewFile,BufRead *.{bb,bbappend,bbclass} set filetype=bitbake au BufNewFile,BufRead *.{bb,bbappend,bbclass} setfiletype bitbake
" .inc " .inc -- meanwhile included upstream
au BufNewFile,BufRead *.inc set filetype=bitbake if !has("patch-9.0.0055")
au BufNewFile,BufRead *.inc call s:BBIncDetect()
def s:BBIncDetect()
l:lines = getline(1) .. getline(2) .. getline(3)
if l:lines =~# '\<\%(require\|inherit\)\>' || lines =~# '[A-Z][A-Za-z0-9_:${}]*\s\+\%(??\|[?:+]\)\?= '
set filetype bitbake
endif
enddef
endif
" .conf " .conf
au BufNewFile,BufRead *.conf au BufNewFile,BufRead *.conf