diff options
Diffstat (limited to 'bitbake/contrib/vim/syntax/bitbake.vim')
-rw-r--r-- | bitbake/contrib/vim/syntax/bitbake.vim | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/contrib/vim/syntax/bitbake.vim b/bitbake/contrib/vim/syntax/bitbake.vim index fb55f91022..f964621ae5 100644 --- a/bitbake/contrib/vim/syntax/bitbake.vim +++ b/bitbake/contrib/vim/syntax/bitbake.vim | |||
@@ -12,7 +12,7 @@ | |||
12 | " | 12 | " |
13 | " It's an entirely new type, just has specific syntax in shell and python code | 13 | " It's an entirely new type, just has specific syntax in shell and python code |
14 | 14 | ||
15 | if &compatible || v:version < 600 | 15 | if &compatible || v:version < 600 || exists("b:loaded_bitbake_plugin") |
16 | finish | 16 | finish |
17 | endif | 17 | endif |
18 | if exists("b:current_syntax") | 18 | if exists("b:current_syntax") |
@@ -58,8 +58,8 @@ syn match bbVarValue ".*$" contained contains=bbString,bbVarDeref,bbV | |||
58 | syn region bbVarPyValue start=+${@+ skip=+\\$+ end=+}+ contained contains=@python | 58 | syn region bbVarPyValue start=+${@+ skip=+\\$+ end=+}+ contained contains=@python |
59 | 59 | ||
60 | " Vars metadata flags | 60 | " Vars metadata flags |
61 | syn match bbVarFlagDef "^\([a-zA-Z0-9\-_\.]\+\)\(\[[a-zA-Z0-9\-_\.]\+\]\)\@=" contains=bbIdentifier nextgroup=bbVarFlagFlag | 61 | syn match bbVarFlagDef "^\([a-zA-Z0-9\-_\.]\+\)\(\[[a-zA-Z0-9\-_\.+]\+\]\)\@=" contains=bbIdentifier nextgroup=bbVarFlagFlag |
62 | syn region bbVarFlagFlag matchgroup=bbArrayBrackets start="\[" end="\]\s*\(=\|+=\|=+\|?=\)\@=" contained contains=bbIdentifier nextgroup=bbVarEq | 62 | syn region bbVarFlagFlag matchgroup=bbArrayBrackets start="\[" end="\]\s*\(:=\|=\|.=\|=.|+=\|=+\|?=\)\@=" contained contains=bbIdentifier nextgroup=bbVarEq |
63 | 63 | ||
64 | " Includes and requires | 64 | " Includes and requires |
65 | syn keyword bbInclude inherit include require contained | 65 | syn keyword bbInclude inherit include require contained |
@@ -67,15 +67,15 @@ syn match bbIncludeRest ".*$" contained contains=bbString,bbVarDeref | |||
67 | syn match bbIncludeLine "^\(inherit\|include\|require\)\s\+" contains=bbInclude nextgroup=bbIncludeRest | 67 | syn match bbIncludeLine "^\(inherit\|include\|require\)\s\+" contains=bbInclude nextgroup=bbIncludeRest |
68 | 68 | ||
69 | " Add taks and similar | 69 | " Add taks and similar |
70 | syn keyword bbStatement addtask addhandler after before EXPORT_FUNCTIONS contained | 70 | syn keyword bbStatement addtask deltask addhandler after before EXPORT_FUNCTIONS contained |
71 | syn match bbStatementRest ".*$" skipwhite contained contains=bbStatement | 71 | syn match bbStatementRest ".*$" skipwhite contained contains=bbStatement |
72 | syn match bbStatementLine "^\(addtask\|addhandler\|after\|before\|EXPORT_FUNCTIONS\)\s\+" contains=bbStatement nextgroup=bbStatementRest | 72 | syn match bbStatementLine "^\(addtask\|deltask\|addhandler\|after\|before\|EXPORT_FUNCTIONS\)\s\+" contains=bbStatement nextgroup=bbStatementRest |
73 | 73 | ||
74 | " OE Important Functions | 74 | " OE Important Functions |
75 | syn keyword bbOEFunctions do_fetch do_unpack do_patch do_configure do_compile do_stage do_install do_package contained | 75 | syn keyword bbOEFunctions do_fetch do_unpack do_patch do_configure do_compile do_stage do_install do_package contained |
76 | 76 | ||
77 | " Generic Functions | 77 | " Generic Functions |
78 | syn match bbFunction "\h[0-9A-Za-z_-]*" display contained contains=bbOEFunctions | 78 | syn match bbFunction "\h[0-9A-Za-z_\-\.]*" display contained contains=bbOEFunctions |
79 | 79 | ||
80 | " BitBake shell metadata | 80 | " BitBake shell metadata |
81 | syn include @shell syntax/sh.vim | 81 | syn include @shell syntax/sh.vim |
@@ -83,7 +83,7 @@ if exists("b:current_syntax") | |||
83 | unlet b:current_syntax | 83 | unlet b:current_syntax |
84 | endif | 84 | endif |
85 | syn keyword bbShFakeRootFlag fakeroot contained | 85 | syn keyword bbShFakeRootFlag fakeroot contained |
86 | syn match bbShFuncDef "^\(fakeroot\s*\)\?\([0-9A-Za-z_${}-]\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbShFuncRegion skipwhite | 86 | syn match bbShFuncDef "^\(fakeroot\s*\)\?\([\.0-9A-Za-z_${}\-\.]\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbShFuncRegion skipwhite |
87 | syn region bbShFuncRegion matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@shell | 87 | syn region bbShFuncRegion matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@shell |
88 | 88 | ||
89 | " Python value inside shell functions | 89 | " Python value inside shell functions |
@@ -91,7 +91,7 @@ syn region shDeref start=+${@+ skip=+\\$+ excludenl end=+}+ contained co | |||
91 | 91 | ||
92 | " BitBake python metadata | 92 | " BitBake python metadata |
93 | syn keyword bbPyFlag python contained | 93 | syn keyword bbPyFlag python contained |
94 | syn match bbPyFuncDef "^\(python\s\+\)\([0-9A-Za-z_${}-]\+\)\?\(\s*()\s*\)\({\)\@=" contains=bbPyFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbPyFuncRegion skipwhite | 94 | syn match bbPyFuncDef "^\(fakeroot\s*\)\?\(python\)\(\s\+[0-9A-Za-z_${}\-\.]\+\)\?\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbPyFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbPyFuncRegion skipwhite |
95 | syn region bbPyFuncRegion matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@python | 95 | syn region bbPyFuncRegion matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@python |
96 | 96 | ||
97 | " BitBake 'def'd python functions | 97 | " BitBake 'def'd python functions |