commit: 03db9c991553a1e2db9df635bc973fa320f9d615
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 07:23:11 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 07:23:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=03db9c99
syntax: Move atom definition into gentoo-package-common
syntax/gentoo-package-common.vim | 4 ++++
syntax/gentoo-package-keywords.vim | 4 +---
syntax/gentoo-package-license.vim | 4 +---
syntax/gentoo-package-mask.vim | 4 ----
syntax/gentoo-package-properties.vim | 4 +---
syntax/gentoo-package-use.vim | 6 ++----
6 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/syntax/gentoo-package-common.vim b/syntax/gentoo-package-common.vim
index 1e8091e..fe234c7 100644
--- a/syntax/gentoo-package-common.vim
+++ b/syntax/gentoo-package-common.vim
@@ -16,6 +16,10 @@ syn region GentooPackageComment start=/#/ end=/$/
syn match GentooPackageEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooPackageDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
+syn match GentooPackageAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
+ \ nextgroup=@GentooPackagePostAtom skipwhite
+
hi def link GentooPackageComment Comment
hi def link GentooPackageEmail Special
hi def link GentooPackageDate Number
+hi def link GentooPackageAtom Identifier
diff --git a/syntax/gentoo-package-keywords.vim
b/syntax/gentoo-package-keywords.vim
index 4315d91..85bc35b 100644
--- a/syntax/gentoo-package-keywords.vim
+++ b/syntax/gentoo-package-keywords.vim
@@ -18,12 +18,10 @@ endif
runtime syntax/gentoo-package-common.vim
-syn match GentooPackageKeywordsAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackageKeywordsKeyword skipwhite
syn match GentooPackageKeywordsKeyword contained
/-\?[-~]\?\([a-z0-9\-]\+\|\*\)/
\ nextgroup=GentooPackageKeywordsKeyword skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageKeywordsKeyword
-hi def link GentooPackageKeywordsAtom Identifier
hi def link GentooPackageKeywordsKeyword Keyword
let b:current_syntax = "gentoo-package-keywords"
diff --git a/syntax/gentoo-package-license.vim
b/syntax/gentoo-package-license.vim
index 8764a66..7e64c73 100644
--- a/syntax/gentoo-package-license.vim
+++ b/syntax/gentoo-package-license.vim
@@ -18,12 +18,10 @@ endif
runtime syntax/gentoo-package-common.vim
-syn match GentooPackageLicenseAtom /^[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackageLicenseLicense skipwhite
syn match GentooPackageLicenseLicense contained
/-\?@\?\([a-zA-Z0-9\-_.+]\+\|\*\)/
\ nextgroup=GentooPackageLicenseLicense skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageLicenseLicense
-hi def link GentooPackageLicenseAtom Identifier
hi def link GentooPackageLicenseLicense Keyword
let b:current_syntax = "gentoo-package-license"
diff --git a/syntax/gentoo-package-mask.vim b/syntax/gentoo-package-mask.vim
index d08ec0e..1f4e75b 100644
--- a/syntax/gentoo-package-mask.vim
+++ b/syntax/gentoo-package-mask.vim
@@ -18,8 +18,4 @@ endif
runtime syntax/gentoo-package-common.vim
-syn match GentooPackageMaskAtom /^[^ \t\n#]\+\S\+\/\S\+/
-
-hi def link GentooPackageMaskAtom Identifier
-
let b:current_syntax = "gentoo-package-mask"
diff --git a/syntax/gentoo-package-properties.vim
b/syntax/gentoo-package-properties.vim
index faf15ad..014381a 100644
--- a/syntax/gentoo-package-properties.vim
+++ b/syntax/gentoo-package-properties.vim
@@ -18,12 +18,10 @@ endif
runtime syntax/gentoo-package-common.vim
-syn match GentooPackagePropertiesAtom /^[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackagePropertiesProperty skipwhite
syn match GentooPackagePropertiesProperty contained
/-\?\([a-zA-Z0-9\-_]\+\|\*\)/
\ nextgroup=GentooPackagePropertiesProperty skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackagePropertiesProperty
-hi def link GentooPackagePropertiesAtom Identifier
hi def link GentooPackagePropertiesProperty Keyword
let b:current_syntax = "gentoo-package-properties"
diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index 7136467..30f0b95 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -18,9 +18,6 @@ endif
runtime syntax/gentoo-package-common.vim
-syn match GentooPackageUseAtom /^[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse,
- \ GentooPackageUseExpand skipwhite
syn match GentooPackageUseUse contained
\ /[a-zA-Z0-9][a-zA-Z0-9\-_]*\(:\)\@!/
\ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse,
@@ -33,8 +30,9 @@ syn match GentooPackageUseExpand contained
\ /[a-zA-Z0-9][a-zA-Z0-9\-_]*:/
\ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse
\ skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageUseUse,
+ \ GentooPackageUseUnuse,GentooPackageUseExpand
-hi def link GentooPackageUseAtom Identifier
hi def link GentooPackageUseUse Special
hi def link GentooPackageUseUnuse Keyword
hi def link GentooPackageUseExpand Statement
