Mercurial > vim

comparison runtime/syntax/groovy.vim @ 10051:46763b01cd9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 31 22:22:10 2016 +0200 Updated runtime files. Remove HiLink commands.
author Christian Brabandt <cb@256bit.org>
date Wed, 31 Aug 2016 22:30:08 +0200
parents 43efa4f5a8ea
children 74e3316c1d5a
comparison
equal deleted inserted replaced
10050:b702edc4b2b8 10051:46763b01cd9a
53 let main_syntax='groovy' 53 let main_syntax='groovy'
54 endif 54 endif
55 55
56 let s:cpo_save = &cpo 56 let s:cpo_save = &cpo
57 set cpo&vim 57 set cpo&vim
58
59 " don't use standard HiLink, it will not work with included syntax files
60 command! -nargs=+ GroovyHiLink hi def link <args>
61 58
62 " ########################## 59 " ##########################
63 " Java stuff taken from java.vim 60 " Java stuff taken from java.vim
64 " some characters that cannot be in a groovy program (outside a string) 61 " some characters that cannot be in a groovy program (outside a string)
65 " syn match groovyError "[\\@`]" 62 " syn match groovyError "[\\@`]"
136 syn keyword groovyJavaLangClass VirtualMachineError 133 syn keyword groovyJavaLangClass VirtualMachineError
137 134
138 syn keyword groovyJavaLangObject clone equals finalize getClass hashCode 135 syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
139 syn keyword groovyJavaLangObject notify notifyAll toString wait 136 syn keyword groovyJavaLangObject notify notifyAll toString wait
140 137
141 GroovyHiLink groovyLangClass groovyConstant 138 hi def link groovyLangClass groovyConstant
142 GroovyHiLink groovyJavaLangClass groovyExternal 139 hi def link groovyJavaLangClass groovyExternal
143 GroovyHiLink groovyJavaLangObject groovyConstant 140 hi def link groovyJavaLangObject groovyConstant
144 syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass 141 syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
145 syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass 142 syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
146 endif 143 endif
147 144
148 145
212 endif 209 endif
213 syn region groovyComment start="/\*" end="\*/" contains=@groovyCommentSpecial,groovyTodo,@Spell 210 syn region groovyComment start="/\*" end="\*/" contains=@groovyCommentSpecial,groovyTodo,@Spell
214 syn match groovyCommentStar contained "^\s*\*[^/]"me=e-1 211 syn match groovyCommentStar contained "^\s*\*[^/]"me=e-1
215 syn match groovyCommentStar contained "^\s*\*$" 212 syn match groovyCommentStar contained "^\s*\*$"
216 syn match groovyLineComment "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell 213 syn match groovyLineComment "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
217 GroovyHiLink groovyCommentString groovyString 214 hi def link groovyCommentString groovyString
218 GroovyHiLink groovyComment2String groovyString 215 hi def link groovyComment2String groovyString
219 GroovyHiLink groovyCommentCharacter groovyCharacter 216 hi def link groovyCommentCharacter groovyCharacter
220 217
221 syn cluster groovyTop add=groovyComment,groovyLineComment 218 syn cluster groovyTop add=groovyComment,groovyLineComment
222 219
223 if !exists("groovy_ignore_groovydoc") && main_syntax != 'jsp' 220 if !exists("groovy_ignore_groovydoc") && main_syntax != 'jsp'
224 syntax case ignore 221 syntax case ignore
255 syn region groovyString start='/[^/*]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr 252 syn region groovyString start='/[^/*]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr
256 endif 253 endif
257 " syn region groovyELExpr start=+${+ end=+}+ keepend contained 254 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
258 syn match groovyELExpr /\${.\{-}}/ contained 255 syn match groovyELExpr /\${.\{-}}/ contained
259 syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained 256 syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained
260 GroovyHiLink groovyELExpr Identifier 257 hi def link groovyELExpr Identifier
261 258
262 " TODO: better matching. I am waiting to understand how it really works in groovy 259 " TODO: better matching. I am waiting to understand how it really works in groovy
263 " syn region groovyClosureParamsBraces start=+|+ end=+|+ contains=groovyClosureParams 260 " syn region groovyClosureParamsBraces start=+|+ end=+|+ contains=groovyClosureParams
264 " syn match groovyClosureParams "[ a-zA-Z0-9_*]\+" contained 261 " syn match groovyClosureParams "[ a-zA-Z0-9_*]\+" contained
265 " GroovyHiLink groovyClosureParams Identifier 262 " hi def link groovyClosureParams Identifier
266 263
267 " next line disabled, it can cause a crash for a long line 264 " next line disabled, it can cause a crash for a long line
268 "syn match groovyStringError +"\([^"\\]\|\\.\)*$+ 265 "syn match groovyStringError +"\([^"\\]\|\\.\)*$+
269 266
270 " disabled: in groovy strings or characters are written the same 267 " disabled: in groovy strings or characters are written the same
321 syn match groovyDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen 318 syn match groovyDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
322 syn match groovyDebug "\<trace[SL]\=\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen 319 syn match groovyDebug "\<trace[SL]\=\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
323 320
324 syn cluster groovyTop add=groovyDebug 321 syn cluster groovyTop add=groovyDebug
325 322
326 GroovyHiLink groovyDebug Debug 323 hi def link groovyDebug Debug
327 GroovyHiLink groovyDebugString DebugString 324 hi def link groovyDebugString DebugString
328 GroovyHiLink groovyDebugStringError groovyError 325 hi def link groovyDebugStringError groovyError
329 GroovyHiLink groovyDebugType DebugType 326 hi def link groovyDebugType DebugType
330 GroovyHiLink groovyDebugBoolean DebugBoolean 327 hi def link groovyDebugBoolean DebugBoolean
331 GroovyHiLink groovyDebugNumber Debug 328 hi def link groovyDebugNumber Debug
332 GroovyHiLink groovyDebugSpecial DebugSpecial 329 hi def link groovyDebugSpecial DebugSpecial
333 GroovyHiLink groovyDebugSpecialCharacter DebugSpecial 330 hi def link groovyDebugSpecialCharacter DebugSpecial
334 GroovyHiLink groovyDebugCharacter DebugString 331 hi def link groovyDebugCharacter DebugString
335 GroovyHiLink groovyDebugParen Debug 332 hi def link groovyDebugParen Debug
336 333
337 GroovyHiLink DebugString String 334 hi def link DebugString String
338 GroovyHiLink DebugSpecial Special 335 hi def link DebugSpecial Special
339 GroovyHiLink DebugBoolean Boolean 336 hi def link DebugBoolean Boolean
340 GroovyHiLink DebugType Type 337 hi def link DebugType Type
341 endif 338 endif
342 339
343 " Match all Exception classes 340 " Match all Exception classes
344 syn match groovyExceptions "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>" 341 syn match groovyExceptions "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
345 342
369 " syn match groovyBraces "[\[\]]" 366 " syn match groovyBraces "[\[\]]"
370 " syn match groovyBraces "[\|]" 367 " syn match groovyBraces "[\|]"
371 368
372 if exists("groovy_mark_braces_in_parens_as_errors") 369 if exists("groovy_mark_braces_in_parens_as_errors")
373 syn match groovyInParen contained "[{}]" 370 syn match groovyInParen contained "[{}]"
374 GroovyHiLink groovyInParen groovyError 371 hi def link groovyInParen groovyError
375 syn cluster groovyTop add=groovyInParen 372 syn cluster groovyTop add=groovyInParen
376 endif 373 endif
377 374
378 " catch errors caused by wrong parenthesis 375 " catch errors caused by wrong parenthesis
379 syn region groovyParenT transparent matchgroup=groovyParen start="(" end=")" contains=@groovyTop,groovyParenT1 376 syn region groovyParenT transparent matchgroup=groovyParen start="(" end=")" contains=@groovyTop,groovyParenT1
380 syn region groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained 377 syn region groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
381 syn region groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT contained 378 syn region groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT contained
382 syn match groovyParenError ")" 379 syn match groovyParenError ")"
383 GroovyHiLink groovyParenError groovyError 380 hi def link groovyParenError groovyError
384 381
385 " catch errors caused by wrong square parenthesis 382 " catch errors caused by wrong square parenthesis
386 syn region groovyParenT transparent matchgroup=groovyParen start="\[" end="\]" contains=@groovyTop,groovyParenT1 383 syn region groovyParenT transparent matchgroup=groovyParen start="\[" end="\]" contains=@groovyTop,groovyParenT1
387 syn region groovyParenT1 transparent matchgroup=groovyParen1 start="\[" end="\]" contains=@groovyTop,groovyParenT2 contained 384 syn region groovyParenT1 transparent matchgroup=groovyParen1 start="\[" end="\]" contains=@groovyTop,groovyParenT2 contained
388 syn region groovyParenT2 transparent matchgroup=groovyParen2 start="\[" end="\]" contains=@groovyTop,groovyParenT contained 385 syn region groovyParenT2 transparent matchgroup=groovyParen2 start="\[" end="\]" contains=@groovyTop,groovyParenT contained
389 syn match groovyParenError "\]" 386 syn match groovyParenError "\]"
390 387
391 " ############################### 388 " ###############################
392 " java.vim default highlighting 389 " java.vim default highlighting
393 GroovyHiLink groovyFuncDef Function 390 hi def link groovyFuncDef Function
394 GroovyHiLink groovyBraces Function 391 hi def link groovyBraces Function
395 GroovyHiLink groovyBranch Conditional 392 hi def link groovyBranch Conditional
396 GroovyHiLink groovyUserLabelRef groovyUserLabel 393 hi def link groovyUserLabelRef groovyUserLabel
397 GroovyHiLink groovyLabel Label 394 hi def link groovyLabel Label
398 GroovyHiLink groovyUserLabel Label 395 hi def link groovyUserLabel Label
399 GroovyHiLink groovyConditional Conditional 396 hi def link groovyConditional Conditional
400 GroovyHiLink groovyRepeat Repeat 397 hi def link groovyRepeat Repeat
401 GroovyHiLink groovyExceptions Exception 398 hi def link groovyExceptions Exception
402 GroovyHiLink groovyAssert Statement 399 hi def link groovyAssert Statement
403 GroovyHiLink groovyStorageClass StorageClass 400 hi def link groovyStorageClass StorageClass
404 GroovyHiLink groovyMethodDecl groovyStorageClass 401 hi def link groovyMethodDecl groovyStorageClass
405 GroovyHiLink groovyClassDecl groovyStorageClass 402 hi def link groovyClassDecl groovyStorageClass
406 GroovyHiLink groovyScopeDecl groovyStorageClass 403 hi def link groovyScopeDecl groovyStorageClass
407 GroovyHiLink groovyBoolean Boolean 404 hi def link groovyBoolean Boolean
408 GroovyHiLink groovySpecial Special 405 hi def link groovySpecial Special
409 GroovyHiLink groovySpecialError Error 406 hi def link groovySpecialError Error
410 GroovyHiLink groovySpecialCharError Error 407 hi def link groovySpecialCharError Error
411 GroovyHiLink groovyString String 408 hi def link groovyString String
412 GroovyHiLink groovyRegexChar String 409 hi def link groovyRegexChar String
413 GroovyHiLink groovyCharacter Character 410 hi def link groovyCharacter Character
414 GroovyHiLink groovySpecialChar SpecialChar 411 hi def link groovySpecialChar SpecialChar
415 GroovyHiLink groovyNumber Number 412 hi def link groovyNumber Number
416 GroovyHiLink groovyError Error 413 hi def link groovyError Error
417 GroovyHiLink groovyStringError Error 414 hi def link groovyStringError Error
418 GroovyHiLink groovyStatement Statement 415 hi def link groovyStatement Statement
419 GroovyHiLink groovyOperator Operator 416 hi def link groovyOperator Operator
420 GroovyHiLink groovyComment Comment 417 hi def link groovyComment Comment
421 GroovyHiLink groovyDocComment Comment 418 hi def link groovyDocComment Comment
422 GroovyHiLink groovyLineComment Comment 419 hi def link groovyLineComment Comment
423 GroovyHiLink groovyConstant Constant 420 hi def link groovyConstant Constant
424 GroovyHiLink groovyTypedef Typedef 421 hi def link groovyTypedef Typedef
425 GroovyHiLink groovyTodo Todo 422 hi def link groovyTodo Todo
426 423
427 GroovyHiLink groovyCommentTitle SpecialComment 424 hi def link groovyCommentTitle SpecialComment
428 GroovyHiLink groovyDocTags Special 425 hi def link groovyDocTags Special
429 GroovyHiLink groovyDocParam Function 426 hi def link groovyDocParam Function
430 GroovyHiLink groovyCommentStar groovyComment 427 hi def link groovyCommentStar groovyComment
431 428
432 GroovyHiLink groovyType Type 429 hi def link groovyType Type
433 GroovyHiLink groovyExternal Include 430 hi def link groovyExternal Include
434 431
435 GroovyHiLink htmlComment Special 432 hi def link htmlComment Special
436 GroovyHiLink htmlCommentPart Special 433 hi def link htmlCommentPart Special
437 GroovyHiLink groovySpaceError Error 434 hi def link groovySpaceError Error
438 GroovyHiLink groovyJDKBuiltin Special 435 hi def link groovyJDKBuiltin Special
439 GroovyHiLink groovyJDKOperOverl Operator 436 hi def link groovyJDKOperOverl Operator
440 GroovyHiLink groovyJDKMethods Function 437 hi def link groovyJDKMethods Function
441
442 delcommand GroovyHiLink
443 438
444 439
445 let b:current_syntax = "groovy" 440 let b:current_syntax = "groovy"
446 if main_syntax == 'groovy' 441 if main_syntax == 'groovy'
447 unlet main_syntax 442 unlet main_syntax