From 8490f6a5c2f2dd635ae27ef103a13f29f934afb4 Mon Sep 17 00:00:00 2001 From: Jan Larres Date: Tue, 26 Apr 2011 01:56:51 +1200 Subject: [PATCH] Only highlight scopes that have children --- syntax/tagbar.vim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/syntax/tagbar.vim b/syntax/tagbar.vim index 6b0d658..43dc895 100644 --- a/syntax/tagbar.vim +++ b/syntax/tagbar.vim @@ -11,28 +11,28 @@ endif if has('multi_byte') && has('unix') && &encoding == 'utf-8' && \ (empty(&termencoding) || &termencoding == 'utf-8') - syntax match TagbarKind '\([▶▼][-+ ]\)\@<=[^-+: ]\+[^:]\+$' - syntax match TagbarScope '[^-+#▶▼(* ]\+\(\*\? :\)\@=' + syntax match TagbarKind '\([▶▼] \)\@<=[^-+: ]\+[^:]\+$' + syntax match TagbarScope '\([▶▼][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@=' - syntax match TagbarFoldIcon '[▶▼]\([-+# ]\)\@=' + syntax match TagbarFoldIcon '[▶▼]\([-+# ]\)\@=' syntax match TagbarAccessPublic '\([▶▼ ]\)\@<=+\([^-+# ]\)\@=' syntax match TagbarAccessProtected '\([▶▼ ]\)\@<=#\([^-+# ]\)\@=' syntax match TagbarAccessPrivate '\([▶▼ ]\)\@<=-\([^-+# ]\)\@=' elseif has('multi_byte') && (has('win32') || has('win64')) && g:tagbar_usearrows - syntax match TagbarKind '\([▷◢][-+ ]\)\@<=[^-+: ]\+[^:]\+$' - syntax match TagbarScope '[^-+#▷◢(* ]\+\(\*\? :\)\@=' + syntax match TagbarKind '\([▷◢] \)\@<=[^-+: ]\+[^:]\+$' + syntax match TagbarScope '\([▷◢][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@=' - syntax match TagbarFoldIcon '[▷◢]\([-+# ]\)\@=' + syntax match TagbarFoldIcon '[▷◢]\([-+# ]\)\@=' syntax match TagbarAccessPublic '\([▷◢ ]\)\@<=+\([^-+# ]\)\@=' syntax match TagbarAccessProtected '\([▷◢ ]\)\@<=#\([^-+# ]\)\@=' syntax match TagbarAccessPrivate '\([▷◢ ]\)\@<=-\([^-+# ]\)\@=' else - syntax match TagbarKind '\([-+][-+ ]\)\@<=[^-+: ]\+[^:]\+$' - syntax match TagbarScope '[^-+#(* ]\+\(\*\? :\)\@=' + syntax match TagbarKind '\([-+] \)\@<=[^-+: ]\+[^:]\+$' + syntax match TagbarScope '\([-+][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@=' - syntax match TagbarFoldIcon '[-+]\([-+# ]\)\@=' + syntax match TagbarFoldIcon '[-+]\([-+# ]\)\@=' syntax match TagbarAccessPublic '\([-+ ]\)\@<=+\([^-+# ]\)\@=' syntax match TagbarAccessProtected '\([-+ ]\)\@<=#\([^-+# ]\)\@='