From 67ca74153a631fa33f6f52ea963ed6d7778f255b Mon Sep 17 00:00:00 2001 From: Sergej Pupykin Date: Wed, 17 Jun 2015 17:51:57 +0300 Subject: [PATCH 1/2] remove [\s]* from patterns Assume that PKGBUILD-specific variables must start from linestart. (Usualy they do) [\s]* cause conflicts on 'install' keyword for example when install command highlighted as PKGBUILD-specific variable. --- misc/syntax/PKGBUILD.syntax | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/misc/syntax/PKGBUILD.syntax b/misc/syntax/PKGBUILD.syntax index 8ca702fb8e..b32b2124cf 100644 --- a/misc/syntax/PKGBUILD.syntax +++ b/misc/syntax/PKGBUILD.syntax @@ -5,20 +5,20 @@ context default keyword whole linestart pkgname brightcyan keyword whole linestart pkgver brightcyan keyword whole linestart pkgrel brightcyan - keyword whole linestart \[\s\]*pkgdesc brightcyan + keyword whole linestart pkgdesc brightcyan keyword whole linestart arch brightcyan keyword whole linestart url brightcyan keyword whole linestart license brightcyan - keyword whole linestart \[\s\]*groups brightcyan - keyword whole linestart \[\s\]*depends brightcyan - keyword whole linestart \[\s\]*makedepends brightcyan - keyword whole linestart \[\s\]*optdepends brightcyan - keyword whole linestart \[\s\]*provides brightcyan - keyword whole linestart \[\s\]*conflicts brightcyan - keyword whole linestart \[\s\]*replaces brightcyan + keyword whole linestart groups brightcyan + keyword whole linestart depends brightcyan + keyword whole linestart makedepends brightcyan + keyword whole linestart optdepends brightcyan + keyword whole linestart provides brightcyan + keyword whole linestart conflicts brightcyan + keyword whole linestart replaces brightcyan keyword whole linestart backup brightcyan keyword whole linestart options brightcyan - keyword whole linestart \[\s\]*install brightcyan + keyword whole linestart install brightcyan keyword whole linestart source brightcyan keyword whole linestart noextract brightcyan keyword whole linestart backup brightcyan From 8bf3940a4fcffe1136be9be97124867da671b868 Mon Sep 17 00:00:00 2001 From: Sergej Pupykin Date: Wed, 17 Jun 2015 17:58:22 +0300 Subject: [PATCH 2/2] update PKGBUILD.syntax according to latest pacman version This commit adds msg. debug,validpgpkey,changelog,epoch and removes force keyword according to current PKGBUILD man. --- misc/syntax/PKGBUILD.syntax | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/misc/syntax/PKGBUILD.syntax b/misc/syntax/PKGBUILD.syntax index b32b2124cf..2e7a5d5511 100644 --- a/misc/syntax/PKGBUILD.syntax +++ b/misc/syntax/PKGBUILD.syntax @@ -3,6 +3,7 @@ context default keyword whole linestart pkgbase brightcyan keyword whole linestart pkgname brightcyan + keyword whole linestart epoch brightcyan keyword whole linestart pkgver brightcyan keyword whole linestart pkgrel brightcyan keyword whole linestart pkgdesc brightcyan @@ -13,6 +14,7 @@ context default keyword whole linestart depends brightcyan keyword whole linestart makedepends brightcyan keyword whole linestart optdepends brightcyan + keyword whole linestart checkdepends brightcyan keyword whole linestart provides brightcyan keyword whole linestart conflicts brightcyan keyword whole linestart replaces brightcyan @@ -22,6 +24,8 @@ context default keyword whole linestart source brightcyan keyword whole linestart noextract brightcyan keyword whole linestart backup brightcyan + keyword whole linestart changelog brightcyan + keyword whole linestart validpgpkeys brightcyan keyword whole linestart md5sums brightcyan keyword whole linestart sha1sums brightcyan keyword whole linestart sha256sums brightcyan @@ -175,6 +179,7 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ keyword whole mktemp cyan keyword whole more cyan keyword whole mount cyan + keyword whole msg cyan keyword whole mt cyan keyword whole mv cyan keyword whole netconf cyan @@ -423,8 +428,10 @@ context exclusive linestart options ) lightgray keyword whole zipman brightgreen keyword whole ccache brightgreen keyword whole distcc brightgreen + keyword whole buildflags brightgreen keyword whole makeflags brightgreen - keyword whole force brightgreen + keyword whole debug brightgreen + keyword whole upx brightgreen keyword whole !strip brightred keyword whole !docs brightred @@ -433,8 +440,10 @@ context exclusive linestart options ) lightgray keyword whole !zipman brightred keyword whole !ccache brightred keyword whole !distcc brightred + keyword whole !buildflags brightred keyword whole !makeflags brightred - keyword whole !force brightred + keyword whole !debug brightred + keyword whole !upx brightred context exclusive linestart arch ) lightgray keyword whole any brightcyan