comparison runtime/syntax/d.vim @ 7924:00d64eb49ce1

commit https://github.com/vim/vim/commit/681baaf4a4c81418693dcafb81421a8614832e91 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 4 20:57:07 2016 +0100 Update runtime files.
author Christian Brabandt <cb@256bit.org>
date Thu, 04 Feb 2016 21:00:05 +0100
parents 173c9c860e42
children
comparison
equal deleted inserted replaced
7923:dacd57ae37f5 7924:00d64eb49ce1
1 " Vim syntax file for the D programming language (version 1.076 and 2.063). 1 " Vim syntax file for the D programming language (version 1.076 and 2.069).
2 " 2 "
3 " Language: D 3 " Language: D
4 " Maintainer: Jesse Phillips <Jesse.K.Phillips+D@gmail.com> 4 " Maintainer: Jesse Phillips <Jesse.K.Phillips+D@gmail.com>
5 " Last Change: 2013 October 5 5 " Last Change: 2016 Feb 2
6 " Version: 0.26 6 " Version: 0.28
7 " 7 "
8 " Contributors: 8 " Contributors:
9 " - Jason Mills: original Maintainer 9 " - Jason Mills: original Maintainer
10 " - Kirk McDonald 10 " - Kirk McDonald
11 " - Tim Keating 11 " - Tim Keating
13 " - Shougo Matsushita 13 " - Shougo Matsushita
14 " - Ellery Newcomer 14 " - Ellery Newcomer
15 " - Steven N. Oliver 15 " - Steven N. Oliver
16 " - Sohgo Takeuchi 16 " - Sohgo Takeuchi
17 " - Robert Clipsham 17 " - Robert Clipsham
18 " - Petar Kirov
18 " 19 "
19 " Please submit bugs/comments/suggestions to the github repo: 20 " Please submit bugs/comments/suggestions to the github repo:
20 " https://github.com/JesseKPhillips/d.vim 21 " https://github.com/JesseKPhillips/d.vim
21 " 22 "
22 " Options: 23 " Options:
112 syn keyword dTraitsIdentifier contained isPOD isNested isFloating 113 syn keyword dTraitsIdentifier contained isPOD isNested isFloating
113 syn keyword dTraitsIdentifier contained isIntegral isScalar isStaticArray 114 syn keyword dTraitsIdentifier contained isIntegral isScalar isStaticArray
114 syn keyword dTraitsIdentifier contained isUnsigned isVirtualFunction 115 syn keyword dTraitsIdentifier contained isUnsigned isVirtualFunction
115 syn keyword dTraitsIdentifier contained isVirtualMethod isAbstractFunction 116 syn keyword dTraitsIdentifier contained isVirtualMethod isAbstractFunction
116 syn keyword dTraitsIdentifier contained isFinalFunction isStaticFunction 117 syn keyword dTraitsIdentifier contained isFinalFunction isStaticFunction
118 syn keyword dTraitsIdentifier contained isOverrideFunction isTemplate
117 syn keyword dTraitsIdentifier contained isRef isOut isLazy hasMember 119 syn keyword dTraitsIdentifier contained isRef isOut isLazy hasMember
118 syn keyword dTraitsIdentifier contained identifier getAttributes getMember 120 syn keyword dTraitsIdentifier contained identifier getAliasThis
119 syn keyword dTraitsIdentifier contained getOverloads getProtection 121 syn keyword dTraitsIdentifier contained getAttributes getFunctionAttributes getMember
120 syn keyword dTraitsIdentifier contained getVirtualFunctions 122 syn keyword dTraitsIdentifier contained getOverloads getPointerBitmap getProtection
121 syn keyword dTraitsIdentifier contained getVirtualMethods parent 123 syn keyword dTraitsIdentifier contained getVirtualFunctions getVirtualIndex
122 syn keyword dTraitsIdentifier contained classInstanceSize allMembers 124 syn keyword dTraitsIdentifier contained getVirtualMethods getUnitTests
125 syn keyword dTraitsIdentifier contained parent classInstanceSize allMembers
123 syn keyword dTraitsIdentifier contained derivedMembers isSame compiles 126 syn keyword dTraitsIdentifier contained derivedMembers isSame compiles
124 syn keyword dPragmaIdentifier contained lib msg startaddress GNU_asm 127 syn keyword dPragmaIdentifier contained inline lib mangle msg startaddress GNU_asm
125 syn keyword dExternIdentifier contained Windows Pascal Java System D 128 syn keyword dExternIdentifier contained C C++ D Windows Pascal System Objective-C
126 syn keyword dAttribute contained safe trusted system 129 syn keyword dAttribute contained safe trusted system
127 syn keyword dAttribute contained property disable 130 syn keyword dAttribute contained property disable nogc
128 syn keyword dVersionIdentifier contained DigitalMars GNU LDC SDC D_NET 131 syn keyword dVersionIdentifier contained DigitalMars GNU LDC SDC D_NET
129 syn keyword dVersionIdentifier contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha 132 syn keyword dVersionIdentifier contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha
130 syn keyword dVersionIdentifier contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64 133 syn keyword dVersionIdentifier contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64
131 syn keyword dVersionIdentifier contained linux Posix OSX FreeBSD Windows Win32 Win64 134 syn keyword dVersionIdentifier contained linux Posix OSX FreeBSD Windows Win32 Win64
132 syn keyword dVersionIdentifier contained OpenBSD BSD Solaris AIX SkyOS SysV3 SysV4 Hurd 135 syn keyword dVersionIdentifier contained OpenBSD BSD Solaris AIX SkyOS SysV3 SysV4 Hurd
133 syn keyword dVersionIdentifier contained Cygwin MinGW 136 syn keyword dVersionIdentifier contained Cygwin MinGW
134 syn keyword dVersionIdentifier contained LittleEndian BigEndian 137 syn keyword dVersionIdentifier contained LittleEndian BigEndian
135 syn keyword dVersionIdentifier contained D_InlineAsm_X86 D_InlineAsm_X86_64 138 syn keyword dVersionIdentifier contained D_InlineAsm_X86 D_InlineAsm_X86_64
136 syn keyword dVersionIdentifier contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC 139 syn keyword dVersionIdentifier contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC
137 syn keyword dVersionIdentifier contained unittest none all 140 syn keyword dVersionIdentifier contained unittest assert none all
138 141
139 syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment 142 syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment
140 143
141 " Highlight the sharpbang 144 " Highlight the sharpbang
142 syn match dSharpBang "\%^#!.*" display 145 syn match dSharpBang "\%^#!.*" display
166 " Extern Identifiers 169 " Extern Identifiers
167 syn match dExternal "\<extern\>" 170 syn match dExternal "\<extern\>"
168 syn match dExtern "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier 171 syn match dExtern "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier
169 172
170 " Make import a region to prevent highlighting keywords 173 " Make import a region to prevent highlighting keywords
171 syn region dImport start="import\_s" end=";" contains=dExternal,@dComment 174 syn region dImport start="\<import\_s" end=";" contains=dExternal,@dComment
172 175
173 " Make module a region to prevent highlighting keywords 176 " Make module a region to prevent highlighting keywords
174 syn region dImport start="module\_s" end=";" contains=dExternal,@dComment 177 syn region dImport start="\<module\_s" end=";" contains=dExternal,@dComment
175 178
176 " dTokens is used by the token string highlighting 179 " dTokens is used by the token string highlighting
177 syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean 180 syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean
178 syn cluster dTokens add=dConstant,dTypedef,dStructure,dOperator,dOpOverload 181 syn cluster dTokens add=dConstant,dTypedef,dStructure,dOperator,dOpOverload
179 syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement 182 syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement
244 " 247 "
245 syn match dUnicode "\\u\d\{4\}" 248 syn match dUnicode "\\u\d\{4\}"
246 249
247 " String. 250 " String.
248 " 251 "
249 syn region dString start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dEscSequence,@Spell 252 syn match dFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
253 syn match dFormat display "%%" contained
254
255 syn region dString start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dFormat,dEscSequence,@Spell
250 syn region dRawString start=+`+ end=+`[cwd]\=+ contains=@Spell 256 syn region dRawString start=+`+ end=+`[cwd]\=+ contains=@Spell
251 syn region dRawString start=+r"+ end=+"[cwd]\=+ contains=@Spell 257 syn region dRawString start=+r"+ end=+"[cwd]\=+ contains=@Spell
252 syn region dHexString start=+x"+ end=+"[cwd]\=+ contains=@Spell 258 syn region dHexString start=+x"+ end=+"[cwd]\=+ contains=@Spell
253 syn region dDelimString start=+q"\z(.\)+ end=+\z1"+ contains=@Spell 259 syn region dDelimString start=+q"\z(.\)+ end=+\z1"+ contains=@Spell
254 syn region dHereString start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell 260 syn region dHereString start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell
255 261
262
256 " Nesting delimited string contents 263 " Nesting delimited string contents
257 " 264 "
258 syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell 265 syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell
259 syn region dNestBrackString start=+\[+ end=+\]+ contained transparent contains=dNestBrackString,@Spell 266 syn region dNestBrackString start=+\[+ end=+\]+ contained transparent contains=dNestBrackString,@Spell
260 syn region dNestAngleString start=+<+ end=+>+ contained transparent contains=dNestAngleString,@Spell 267 syn region dNestAngleString start=+<+ end=+>+ contained transparent contains=dNestAngleString,@Spell
274 281
275 syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString 282 syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString
276 283
277 " Token strings 284 " Token strings
278 " 285 "
279 syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens 286 syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens,dFormat
280 syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens 287 syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens,dFormat
281 288
282 syn cluster dTokens add=dTokenString 289 syn cluster dTokens add=dTokenString
283 290
284 " Numbers 291 " Numbers
285 " 292 "
355 hi def link dRawString String 362 hi def link dRawString String
356 hi def link dString String 363 hi def link dString String
357 hi def link dHexString String 364 hi def link dHexString String
358 hi def link dCharacter Character 365 hi def link dCharacter Character
359 hi def link dEscSequence SpecialChar 366 hi def link dEscSequence SpecialChar
367 hi def link dFormat SpecialChar
360 hi def link dSpecialCharError Error 368 hi def link dSpecialCharError Error
361 hi def link dOctalError Error 369 hi def link dOctalError Error
362 hi def link dOperator Operator 370 hi def link dOperator Operator
363 hi def link dOpOverload Identifier 371 hi def link dOpOverload Identifier
364 hi def link dConstant Constant 372 hi def link dConstant Constant