Skip to content
Browse files

Merge pull request #13 from alexrp/master

More traits and pragma highlighting.
  • Loading branch information...
2 parents a4c4ba2 + 5041f65 commit c4e0304bd1d9ab5e6d3caeba9033888b9c9a904e @JesseKPhillips committed Dec 6, 2012
Showing with 9 additions and 1 deletion.
  1. +9 −1 d.vim
View
10 d.vim
@@ -111,6 +111,9 @@ syn keyword dTraitsIdentifier contained isAbstractFunction isFinalFunction
syn keyword dTraitsIdentifier contained isRef isOut isLazy hasMember identifier getMember
syn keyword dTraitsIdentifier contained getOverloads getVirtualFunctions parent compiles
syn keyword dTraitsIdentifier contained classInstanceSize allMembers derivedMembers isSame
+syn keyword dTraitsIdentifier contained parameters getAttributes isVirtualMethod
+syn keyword dTraitsIdentifier contained getVirtualMethods
+syn keyword dPragmaIdentifier contained lib msg startaddress GNU_asm
syn keyword dExternIdentifier contained Windows Pascal Java System D
syn keyword dAttribute contained safe trusted system
syn keyword dAttribute contained property disable
@@ -142,6 +145,8 @@ syn match dStorageClass "\<scope\>"
" Traits Expression
syn match dStatement "\<__traits\>"
+syn match dStatement "\<pragma\>"
+
" Extern Modifier
syn match dExternal "\<extern\>"
@@ -151,6 +156,8 @@ syn match dScope "\<scope\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+5 contains=dScopeIden
" Traits Identifiers
syn match dTraits "\<__traits\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+8 contains=dTraitsIdentifier
+syn match dPragma "\<pragma\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+8 contains=dPragmaIdentifier
+
" Necessary to highlight C++ in extern modifiers.
syn match dExternIdentifier "C\(++\)\?" contained
@@ -359,7 +366,6 @@ hi def link dLineComment Comment
hi def link dBlockComment Comment
hi def link dNestedComment Comment
hi def link dExternal Include
-hi def link dPragma PreProc
hi def link dAnnotation PreProc
hi def link dSharpBang PreProc
hi def link dAttribute StorageClass
@@ -370,6 +376,8 @@ hi def link dScope dStorageClass
hi def link dScopeIdentifier Identifier
hi def link dTraits dStatement
hi def link dTraitsIdentifier Identifier
+hi def link dPragma PreProc
+hi def link dPragmaIdentifier Identifier
hi def link dExtern dExternal
hi def link dExternIdentifier Identifier

0 comments on commit c4e0304

Please sign in to comment.
Something went wrong with that request. Please try again.