diff options
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/cs.vim | 17 | ||||
-rw-r--r-- | runtime/syntax/python.vim | 8 | ||||
-rw-r--r-- | runtime/syntax/vrml.vim | 8 |
3 files changed, 25 insertions, 8 deletions
diff --git a/runtime/syntax/cs.vim b/runtime/syntax/cs.vim index 6a61ed261e..8b63e48b04 100644 --- a/runtime/syntax/cs.vim +++ b/runtime/syntax/cs.vim @@ -1,7 +1,8 @@ " Vim syntax file " Language: C# -" Maintainer: Johannes Zellner <johannes@zellner.org> -" Last Change: Mo, 24 Apr 2006 10:11:07 CEST +" Maintainer: Anduin Withers <awithers@anduin.com> +" Former Maintainer: Johannes Zellner <johannes@zellner.org> +" Last Change: Sun Apr 30 19:26:18 PDT 2006 " Filenames: *.cs " $Id$ " @@ -38,11 +39,16 @@ syn keyword csException try catch finally throw " TODO: syn keyword csUnspecifiedStatement as base checked event fixed in is lock new operator out params ref sizeof stackalloc this typeof unchecked unsafe using " TODO: -syn keyword csUnsupportedStatement get set add remove value +syn keyword csUnsupportedStatement add remove value " TODO: syn keyword csUnspecifiedKeyword explicit implicit +" Contextual Keywords +syn match csContextualStatement /\<yield[[:space:]\n]\+\(return\|break\)/me=s+5 +syn match csContextualStatement /\<partial[[:space:]\n]\+\(class\|struct\|interface\)/me=s+7 +syn match csContextualStatement /\<\(get\|set\)[[:space:]\n]*{/me=s+3 +syn match csContextualStatement /\<where\>[^:]\+:/me=s+5 " Comments " @@ -79,8 +85,10 @@ hi def link xmlRegion Comment " [1] 9.5 Pre-processing directives syn region csPreCondit - \ start="^\s*#\s*\(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\|region\|endregion\)" + \ start="^\s*#\s*\(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\)" \ skip="\\$" end="$" contains=csComment keepend +syn region csRegion matchgroup=csPreCondit start="^\s*#\s*region.*$" + \ end="^\s*#\s*endregion" transparent fold contains=TOP @@ -115,6 +123,7 @@ hi def link csException Exception hi def link csUnspecifiedStatement Statement hi def link csUnsupportedStatement Statement hi def link csUnspecifiedKeyword Keyword +hi def link csContextualStatement Statement hi def link csOperatorError Error hi def link csTodo Todo diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim index 52873e977c..2e387421d7 100644 --- a/runtime/syntax/python.vim +++ b/runtime/syntax/python.vim @@ -52,6 +52,9 @@ syn keyword pythonPreCondit import from as syn match pythonComment "#.*$" contains=pythonTodo syn keyword pythonTodo TODO FIXME XXX contained +" Decorators (new in Python 2.4) +syn match pythonDecorator "@" display nextgroup=pythonFunction skipwhite + " strings syn region pythonString matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape syn region pythonString matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape @@ -85,6 +88,8 @@ endif if exists("python_highlight_builtins") " builtin functions, types and objects, not really part of the syntax + syn keyword pythonBuiltin True False bool enumerate set frozenset help + syn keyword pythonBuiltin reversed sorted sum syn keyword pythonBuiltin Ellipsis None NotImplemented __import__ abs syn keyword pythonBuiltin apply buffer callable chr classmethod cmp syn keyword pythonBuiltin coerce compile complex delattr dict dir divmod @@ -110,6 +115,8 @@ if exists("python_highlight_exceptions") syn keyword pythonException StandardError StopIteration SyntaxError syn keyword pythonException SyntaxWarning SystemError SystemExit TabError syn keyword pythonException TypeError UnboundLocalError UnicodeError + syn keyword pythonException UnicodeEncodeError UnicodeDecodeError + syn keyword pythonException UnicodeTranslateError syn keyword pythonException UserWarning ValueError Warning WindowsError syn keyword pythonException ZeroDivisionError endif @@ -151,6 +158,7 @@ if version >= 508 || !exists("did_python_syn_inits") HiLink pythonPreCondit PreCondit HiLink pythonComment Comment HiLink pythonTodo Todo + HiLink pythonDecorator Define if exists("python_highlight_numbers") HiLink pythonNumber Number endif diff --git a/runtime/syntax/vrml.vim b/runtime/syntax/vrml.vim index 651a39b913..44814aad86 100644 --- a/runtime/syntax/vrml.vim +++ b/runtime/syntax/vrml.vim @@ -1,9 +1,9 @@ " Vim syntax file " Language: VRML97 " Modified from: VRML 1.0C by David Brown <dbrown@cgs.c4.gmeds.com> -" Maintainer: Gregory Seidman <gseidman@acm.org> -" URL: http://www.cs.brown.edu/~gss/vim/syntax/vrml.vim -" Last change: 2003 May 11 +" Maintainer: vacancy! +" Former Maintainer: Gregory Seidman <gsslist+vim@anthropohedron.net> +" Last change: 2006 May 03 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -195,7 +195,7 @@ syn sync minlines=1 if version >= 600 "FOLDS! syn sync fromstart - setlocal foldmethod=syntax + "setlocal foldmethod=syntax syn region braceFold start="{" end="}" transparent fold contains=TOP syn region bracketFold start="\[" end="]" transparent fold contains=TOP syn region VRMLString start=+"+ skip=+\\\\\|\\"+ end=+"+ fold contains=VRMLSpecial,VRMLjScriptString |