From a8f1365f18e82460e4a54d10e8ec142044fb74b3 Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 11 Mar 2013 21:49:51 +0100 Subject: [PATCH] Update matchtag plugin and python syntax --- .vimrc | 3 + bundle/ft_matchtag/ftplugin/html.vim | 15 +- bundle/ft_matchtag/ftplugin/xml.vim | 2 + syntax/python.vim | 613 +++++++++++++++++---------- 4 files changed, 399 insertions(+), 234 deletions(-) create mode 100644 bundle/ft_matchtag/ftplugin/xml.vim diff --git a/.vimrc b/.vimrc index cf30580..dc57cfc 100644 --- a/.vimrc +++ b/.vimrc @@ -201,6 +201,9 @@ map b :CtrlPBuffer "NERDCommenter {{{2 let g:NERDSpaceDelims=1 "}}} +"Python indent{{{2 +let g:python_version_2=1 +"}}} "}}} "KEYS: User defined keyboard shortcuts {{{ diff --git a/bundle/ft_matchtag/ftplugin/html.vim b/bundle/ft_matchtag/ftplugin/html.vim index 320c7e8..ddd2a06 100644 --- a/bundle/ft_matchtag/ftplugin/html.vim +++ b/bundle/ft_matchtag/ftplugin/html.vim @@ -40,8 +40,8 @@ fu! s:GetCurrentCursorTag() let c_col = col('.') let matched = matchstr(getline('.'), '\(<[^<>]*\%'.c_col.'c.\{-}>\)\|\(\%'.c_col.'c<.\{-}>\)') - if matched == "" - return matched + if matched == "" || matched =~ '/>$' + return "" endif let tagname = matchstr(matched, '<\zs.\{-}\ze[ >]') @@ -51,9 +51,9 @@ endfu fu! s:SearchForMatchingTag(tagname, forwards) "returns the position of a matching tag or [0 0] - let starttag = '<'.a:tagname.'.\{-}>' + let starttag = '<'.a:tagname.'.\{-}/\@' let midtag = '' - let endtag = ''.(a:forwards?'':'\zs') + let endtag = '' let flags = 'nW'.(a:forwards?'':'b') " When not in a string or comment ignore matches inside them. @@ -65,7 +65,12 @@ fu! s:SearchForMatchingTag(tagname, forwards) let stopline = a:forwards ? line('w$') : line('w0') let timeout = 300 - return searchpairpos(starttag, midtag, endtag, flags, skip, stopline, timeout) + " The searchpairpos() timeout parameter was added in 7.2 + if v:version >= 702 + return searchpairpos(starttag, midtag, endtag, flags, skip, stopline, timeout) + else + return searchpairpos(starttag, midtag, endtag, flags, skip, stopline) + endif endfu fu! s:HighlightTagAtPosition(position) diff --git a/bundle/ft_matchtag/ftplugin/xml.vim b/bundle/ft_matchtag/ftplugin/xml.vim new file mode 100644 index 0000000..c5d0faf --- /dev/null +++ b/bundle/ft_matchtag/ftplugin/xml.vim @@ -0,0 +1,2 @@ +runtime! ftplugin/html.vim + diff --git a/syntax/python.vim b/syntax/python.vim index 1457746..f9f8e47 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -1,282 +1,428 @@ " Vim syntax file " Language: Python -" Maintainer: Dmitry Vasiliev -" URL: https://github.com/hdima/vim-scripts/blob/master/syntax/python/python.vim -" Last Change: 2012-02-11 -" Filenames: *.py -" Version: 2.6.7 +" Maintainer: Dmitry Vasiliev +" URL: https://github.com/hdima/vim-scripts/blob/master/syntax/python/python.vim +" Last Change: 2013-03-10 +" Filenames: *.py +" Version: 3.3.0 " " Based on python.vim (from Vim 6.1 distribution) " by Neil Schemenauer " -" Thanks: +" Bugs and feature requests can be reported through email +" , GitHub at: " -" Jeroen Ruigrok van der Werven -" for the idea to highlight erroneous operators -" Pedro Algarvio -" for the patch to enable spell checking only for the right spots -" (strings and comments) -" John Eikenberry -" for the patch fixing small typo -" Caleb Adamantine -" for the patch fixing highlighting for decorators -" Andrea Riciputi -" for the patch with new configuration options - +" https://github.com/hdima/vim-scripts/issues " -" Options: +" , or Twitter: " -" For set option do: let OPTION_NAME = 1 -" For clear option do: let OPTION_NAME = 0 +" https://twitter.com/hdima " -" Option names: +" Contributors +" ============ " -" For highlight builtin functions and objects: -" python_highlight_builtins +" Jeroen Ruigrok van der Werven +" Pedro Algarvio +" John Eikenberry +" Caleb Adamantine +" Andrea Riciputi +" Anton Butanaev +" Marc Weber " -" For highlight builtin objects: -" python_highlight_builtin_objs +" Options +" ======= " -" For highlight builtin funtions: -" python_highlight_builtin_funcs +" :let OPTION_NAME = 1 Enable option +" :let OPTION_NAME = 0 Disable option " -" For highlight standard exceptions: -" python_highlight_exceptions " -" For highlight string formatting: -" python_highlight_string_formatting +" Option to select Python version +" ------------------------------- " -" For highlight str.format syntax: -" python_highlight_string_format +" python_version_2 Enable highlighting for Python 2 +" (Python 3 highlighting is enabled +" by default). Can also be set as +" a buffer (b:python_version_2) +" variable. " -" For highlight string.Template syntax: -" python_highlight_string_templates +" You can also use the following local to buffer commands to switch +" between two highlighting modes: " -" For highlight indentation errors: -" python_highlight_indent_errors +" :Python2Syntax Switch to Python 2 highlighting +" mode +" :Python3Syntax Switch to Python 3 highlighting +" mode " -" For highlight trailing spaces: -" python_highlight_space_errors +" Option names used by the script +" ------------------------------- " -" For highlight doc-tests: -" python_highlight_doctests +" python_highlight_builtins Highlight builtin functions and +" objects +" python_highlight_builtin_objs Highlight builtin objects only +" python_highlight_builtin_funcs Highlight builtin functions only +" python_highlight_exceptions Highlight standard exceptions +" python_highlight_string_formatting Highlight % string formatting +" python_highlight_string_format Highlight str.format syntax +" python_highlight_string_templates Highlight string.Template syntax +" python_highlight_indent_errors Highlight indentation errors +" python_highlight_space_errors Highlight trailing spaces +" python_highlight_doctests Highlight doc-tests +" python_print_as_function Highlight 'print' statement as +" function for Python 2 " -" If you want all Python highlightings above: -" python_highlight_all -" (This option not override previously set options) +" python_highlight_all Enable all the options above +" NOTE: This option don't override +" any previously set options " -" For fast machines: -" python_slow_sync +" python_slow_sync Can be set to 0 for slow machines " -" For "print" builtin as function: -" python_print_as_function " For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded +" For versions greater than 6.x: Quit when a syntax file was already loaded if version < 600 syntax clear elseif exists("b:current_syntax") finish endif -if exists("python_highlight_all") && python_highlight_all != 0 - " Not override previously set options - if !exists("python_highlight_builtins") - if !exists("python_highlight_builtin_objs") - let python_highlight_builtin_objs = 1 - endif - if !exists("python_highlight_builtin_funcs") - let python_highlight_builtin_funcs = 1 - endif +" +" Commands +" +command! -buffer Python2Syntax let b:python_version_2 = 1 | if exists("g:syntax_on") | syn off | endif | syn enable +command! -buffer Python3Syntax let b:python_version_2 = 0 | if exists("g:syntax_on") | syn off | endif | syn enable + +" Enable option if it's not defined +function! s:EnableByDefault(name) + if !exists(a:name) + let {a:name} = 1 endif - if !exists("python_highlight_exceptions") - let python_highlight_exceptions = 1 - endif - if !exists("python_highlight_string_formatting") - let python_highlight_string_formatting = 1 - endif - if !exists("python_highlight_string_format") - let python_highlight_string_format = 1 - endif - if !exists("python_highlight_string_templates") - let python_highlight_string_templates = 1 - endif - if !exists("python_highlight_indent_errors") - let python_highlight_indent_errors = 1 - endif - if !exists("python_highlight_space_errors") - let python_highlight_space_errors = 1 - endif - if !exists("python_highlight_doctests") - let python_highlight_doctests = 1 +endfunction + +" Check if option is enabled +function! s:Enabled(name) + return exists(a:name) && {a:name} != 0 +endfunction + +" Is it Python 2 syntax? +function! s:Python2Syntax() + return s:Enabled("b:python_version_2") || s:Enabled("g:python_version_2") +endfunction + +" +" Default options +" + +call s:EnableByDefault("g:python_slow_sync") + +if s:Enabled("g:python_highlight_all") + call s:EnableByDefault("g:python_highlight_builtins") + if s:Enabled("g:python_highlight_builtins") + call s:EnableByDefault("g:python_highlight_builtin_objs") + call s:EnableByDefault("g:python_highlight_builtin_funcs") endif + call s:EnableByDefault("g:python_highlight_exceptions") + call s:EnableByDefault("g:python_highlight_string_formatting") + call s:EnableByDefault("g:python_highlight_string_format") + call s:EnableByDefault("g:python_highlight_string_templates") + call s:EnableByDefault("g:python_highlight_indent_errors") + call s:EnableByDefault("g:python_highlight_space_errors") + call s:EnableByDefault("g:python_highlight_doctests") + call s:EnableByDefault("g:python_print_as_function") endif +" " Keywords -syn keyword pythonStatement break continue del -syn keyword pythonStatement exec return -syn keyword pythonStatement pass raise -syn keyword pythonStatement global assert -syn keyword pythonStatement lambda yield -syn keyword pythonStatement with -syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite -syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" display contained -syn keyword pythonRepeat for while -syn keyword pythonConditional if elif else -syn keyword pythonPreCondit import from as -syn keyword pythonException try except finally -syn keyword pythonOperator and in is not or +" -if !exists("python_print_as_function") || python_print_as_function == 0 - syn keyword pythonStatement print +syn keyword pythonStatement break continue del +syn keyword pythonStatement exec return +syn keyword pythonStatement pass raise +syn keyword pythonStatement global assert +syn keyword pythonStatement lambda yield +syn keyword pythonStatement with +syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite +syn keyword pythonRepeat for while +syn keyword pythonConditional if elif else +syn keyword pythonPreCondit import from +syn keyword pythonException try except finally +syn keyword pythonOperator and in is not or + +if s:Python2Syntax() + if !s:Enabled("g:python_print_as_function") + syn keyword pythonStatement print + endif + syn keyword pythonPreCondit as + syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" display contained +else + syn keyword pythonStatement as nonlocal False None True + syn match pythonFunction "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained endif +" " Decorators (new in Python 2.4) +" + " gryf: match also name of the decorator not only at sign. syn match pythonDecorator "@[a-zA-Z_][a-zA-Z0-9_]*" display nextgroup=pythonDottedName skipwhite "syn match pythonDecorator "@" display nextgroup=pythonDottedName skipwhite -syn match pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained +syn match pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\%(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained syn match pythonDot "\." display containedin=pythonDottedName +" " Comments +" + syn match pythonComment "#.*$" display contains=pythonTodo,@Spell syn match pythonRun "\%^#!.*$" -syn match pythonCoding "\%^.*\(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$" +syn match pythonCoding "\%^.*\%(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$" syn keyword pythonTodo TODO FIXME XXX contained +" " Errors +" + syn match pythonError "\<\d\+\D\+\>" display syn match pythonError "[$?]" display syn match pythonError "[&|]\{2,}" display syn match pythonError "[=]\{3,}" display -" TODO: Mixing spaces and tabs also may be used for pretty formatting multiline -" statements. For now I don't know how to work around this. -if exists("python_highlight_indent_errors") && python_highlight_indent_errors != 0 - syn match pythonIndentError "^\s*\( \t\|\t \)\s*\S"me=e-1 display +" Mixing spaces and tabs also may be used for pretty formatting multiline +" statements +if s:Enabled("g:python_highlight_indent_errors") + syn match pythonIndentError "^\s*\%( \t\|\t \)\s*\S"me=e-1 display endif " Trailing space errors -if exists("python_highlight_space_errors") && python_highlight_space_errors != 0 +if s:Enabled("g:python_highlight_space_errors") syn match pythonSpaceError "\s\+$" display endif +" " Strings -syn region pythonString start=+[bB]\='+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonEscape,pythonEscapeError,@Spell -syn region pythonString start=+[bB]\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonEscape,pythonEscapeError,@Spell -syn region pythonString start=+[bB]\="""+ end=+"""+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest2,pythonSpaceError,@Spell -syn region pythonString start=+[bB]\='''+ end=+'''+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest,pythonSpaceError,@Spell +" -syn match pythonEscape +\\[abfnrtv'"\\]+ display contained -syn match pythonEscape "\\\o\o\=\o\=" display contained -syn match pythonEscapeError "\\\o\{,2}[89]" display contained -syn match pythonEscape "\\x\x\{2}" display contained -syn match pythonEscapeError "\\x\x\=\X" display contained -syn match pythonEscape "\\$" +if s:Python2Syntax() + " Python 2 strings + syn region pythonString start=+[bB]\='+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell + syn region pythonString start=+[bB]\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell + syn region pythonString start=+[bB]\="""+ end=+"""+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell + syn region pythonString start=+[bB]\='''+ end=+'''+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell +else + " Python 3 byte strings + syn region pythonBytes start=+[bB]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesError,pythonBytesContent,@Spell + syn region pythonBytes start=+[bB]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesError,pythonBytesContent,@Spell + syn region pythonBytes start=+[bB]"""+ end=+"""+ keepend contains=pythonBytesError,pythonBytesContent,pythonDocTest2,pythonSpaceError,@Spell + syn region pythonBytes start=+[bB]'''+ end=+'''+ keepend contains=pythonBytesError,pythonBytesContent,pythonDocTest,pythonSpaceError,@Spell -" Unicode strings -syn region pythonUniString start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,@Spell -syn region pythonUniString start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,@Spell -syn region pythonUniString start=+[uU]"""+ end=+"""+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell -syn region pythonUniString start=+[uU]'''+ end=+'''+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell - -syn match pythonUniEscape "\\u\x\{4}" display contained -syn match pythonUniEscapeError "\\u\x\{,3}\X" display contained -syn match pythonUniEscape "\\U\x\{8}" display contained -syn match pythonUniEscapeError "\\U\x\{,7}\X" display contained -syn match pythonUniEscape "\\N{[A-Z ]\+}" display contained -syn match pythonUniEscapeError "\\N{[^A-Z ]\+}" display contained - -" Raw strings -syn region pythonRawString start=+[rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell -syn region pythonRawString start=+[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell -syn region pythonRawString start=+[rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell -syn region pythonRawString start=+[rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell - -syn match pythonRawEscape +\\['"]+ display transparent contained - -" Unicode raw strings -syn region pythonUniRawString start=+[uU][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell -syn region pythonUniRawString start=+[uU][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell -syn region pythonUniRawString start=+[uU][rR]"""+ end=+"""+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest2,pythonSpaceError,@Spell -syn region pythonUniRawString start=+[uU][rR]'''+ end=+'''+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest,pythonSpaceError,@Spell - -syn match pythonUniRawEscape "\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}" display contained -syn match pythonUniRawEscapeError "\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X" display contained - -if exists("python_highlight_string_formatting") && python_highlight_string_formatting != 0 - " String formatting - syn match pythonStrFormatting "%\(([^)]\+)\)\=[-#0 +]*\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString - syn match pythonStrFormatting "%[-#0 +]*\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString + syn match pythonBytesError ".\+" display contained + syn match pythonBytesContent "[\u0000-\u00ff]\+" display contained contains=pythonBytesEscape,pythonBytesEscapeError endif -if exists("python_highlight_string_format") && python_highlight_string_format != 0 +syn match pythonBytesEscape +\\[abfnrtv'"\\]+ display contained +syn match pythonBytesEscape "\\\o\o\=\o\=" display contained +syn match pythonBytesEscapeError "\\\o\{,2}[89]" display contained +syn match pythonBytesEscape "\\x\x\{2}" display contained +syn match pythonBytesEscapeError "\\x\x\=\X" display contained +syn match pythonBytesEscape "\\$" + +syn match pythonUniEscape "\\u\x\{4}" display contained +syn match pythonUniEscapeError "\\u\x\{,3}\X" display contained +syn match pythonUniEscape "\\U\x\{8}" display contained +syn match pythonUniEscapeError "\\U\x\{,7}\X" display contained +syn match pythonUniEscape "\\N{[A-Z ]\+}" display contained +syn match pythonUniEscapeError "\\N{[^A-Z ]\+}" display contained + +if s:Python2Syntax() + " Python 2 Unicode strings + syn region pythonUniString start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell + syn region pythonUniString start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell + syn region pythonUniString start=+[uU]"""+ end=+"""+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell + syn region pythonUniString start=+[uU]'''+ end=+'''+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell +else + " Python 3 strings + syn region pythonString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell + syn region pythonString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell + syn region pythonString start=+"""+ end=+"""+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell + syn region pythonString start=+'''+ end=+'''+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell +endif + +if s:Python2Syntax() + " Python 2 Unicode raw strings + syn region pythonUniRawString start=+[uU][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell + syn region pythonUniRawString start=+[uU][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell + syn region pythonUniRawString start=+[uU][rR]"""+ end=+"""+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest2,pythonSpaceError,@Spell + syn region pythonUniRawString start=+[uU][rR]'''+ end=+'''+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest,pythonSpaceError,@Spell + + syn match pythonUniRawEscape "\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}" display contained + syn match pythonUniRawEscapeError "\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X" display contained +endif + +" Python 2/3 raw strings +if s:Python2Syntax() + syn region pythonRawString start=+[bB]\=[rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell + syn region pythonRawString start=+[bB]\=[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell + syn region pythonRawString start=+[bB]\=[rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell + syn region pythonRawString start=+[bB]\=[rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell +else + syn region pythonRawString start=+[rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell + syn region pythonRawString start=+[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell + syn region pythonRawString start=+[rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell + syn region pythonRawString start=+[rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell + + syn region pythonRawBytes start=+[bB][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell + syn region pythonRawBytes start=+[bB][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell + syn region pythonRawBytes start=+[bB][rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell + syn region pythonRawBytes start=+[bB][rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell +endif + +syn match pythonRawEscape +\\['"]+ display transparent contained + +if s:Enabled("g:python_highlight_string_formatting") + " % operator string formatting + if s:Python2Syntax() + syn match pythonStrFormatting "%\%(([^)]\+)\)\=[-#0 +]*\d*\%(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + syn match pythonStrFormatting "%[-#0 +]*\%(\*\|\d\+\)\=\%(\.\%(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + else + syn match pythonStrFormatting "%\%(([^)]\+)\)\=[-#0 +]*\d*\%(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonRawString + syn match pythonStrFormatting "%[-#0 +]*\%(\*\|\d\+\)\=\%(\.\%(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonRawString + endif +endif + +if s:Enabled("g:python_highlight_string_format") " str.format syntax - syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString - syn match pythonStrFormat "{\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)\(\.[a-zA-Z_][a-zA-Z0-9_]*\|\[\(\d\+\|[^!:\}]\+\)\]\)*\(![rs]\)\=\(:\({\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)}\|\([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString + if s:Python2Syntax() + syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + syn match pythonStrFormat "{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\=\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + else + syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonRawString + syn match pythonStrFormat "{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\=\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonRawString + endif endif -if exists("python_highlight_string_templates") && python_highlight_string_templates != 0 - " String templates - syn match pythonStrTemplate "\$\$" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString - syn match pythonStrTemplate "\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString - syn match pythonStrTemplate "\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString +if s:Enabled("g:python_highlight_string_templates") + " string.Template format + if s:Python2Syntax() + syn match pythonStrTemplate "\$\$" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + syn match pythonStrTemplate "\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + syn match pythonStrTemplate "\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString + else + syn match pythonStrTemplate "\$\$" contained containedin=pythonString,pythonRawString + syn match pythonStrTemplate "\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonRawString + syn match pythonStrTemplate "\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonRawString + endif endif -if exists("python_highlight_doctests") && python_highlight_doctests != 0 +if s:Enabled("g:python_highlight_doctests") " DocTests syn region pythonDocTest start="^\s*>>>" end=+'''+he=s-1 end="^\s*$" contained syn region pythonDocTest2 start="^\s*>>>" end=+"""+he=s-1 end="^\s*$" contained endif +" " Numbers (ints, longs, floats, complex) -syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*[lL]\=\>" display +" -syn match pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display -syn match pythonOctNumber "\<0[oO]\o\+[lL]\=\>" display -syn match pythonBinNumber "\<0[bB][01]\+[lL]\=\>" display +if s:Python2Syntax() + syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\+\x*[lL]\=\>" display + syn match pythonOctError "\<0[oO]\=\o*\D\+\d*[lL]\=\>" display + syn match pythonBinError "\<0[bB][01]*\D\+\d*[lL]\=\>" display -syn match pythonNumber "\<\d\+[lLjJ]\=\>" display + syn match pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display + syn match pythonOctNumber "\<0[oO]\o\+[lL]\=\>" display + syn match pythonBinNumber "\<0[bB][01]\+[lL]\=\>" display -syn match pythonFloat "\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>" display + syn match pythonNumberError "\<\d\+\D[lL]\=\>" display + syn match pythonNumber "\<\d[lL]\=\>" display + syn match pythonNumber "\<[0-9]\d\+[lL]\=\>" display + syn match pythonNumber "\<\d\+[lLjJ]\>" display + + syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display + syn match pythonBinError "\<0[bB][01]*[2-9]\d*[lL]\=\>" display +else + syn match pythonHexError "\<0[xX]\x*[g-zG-Z]\x*\>" display + syn match pythonOctError "\<0[oO]\=\o*\D\+\d*\>" display + syn match pythonBinError "\<0[bB][01]*\D\+\d*\>" display + + syn match pythonHexNumber "\<0[xX]\x\+\>" display + syn match pythonOctNumber "\<0[oO]\o\+\>" display + syn match pythonBinNumber "\<0[bB][01]\+\>" display + + syn match pythonNumberError "\<\d\+\D\>" display + syn match pythonNumberError "\<0\d\+\>" display + syn match pythonNumber "\<\d\>" display + syn match pythonNumber "\<[1-9]\d\+\>" display + syn match pythonNumber "\<\d\+[jJ]\>" display + + syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*\>" display + syn match pythonBinError "\<0[bB][01]*[2-9]\d*\>" display +endif + +syn match pythonFloat "\.\d\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>" display syn match pythonFloat "\<\d\+[eE][+-]\=\d\+[jJ]\=\>" display -syn match pythonFloat "\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display +syn match pythonFloat "\<\d\+\.\d*\%([eE][+-]\=\d\+\)\=[jJ]\=" display -syn match pythonOctError "\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display -syn match pythonBinError "\<0[bB][01]*[2-9]\d*[lL]\=\>" display +" +" Builtin objects and types +" -if exists("python_highlight_builtin_objs") && python_highlight_builtin_objs != 0 - " Builtin objects and types - syn keyword pythonBuiltinObj True False Ellipsis None NotImplemented +if s:Enabled("g:python_highlight_builtin_objs") + if s:Python2Syntax() + syn keyword pythonBuiltinObj True False None + endif + syn keyword pythonBuiltinObj Ellipsis NotImplemented syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ endif -if exists("python_highlight_builtin_funcs") && python_highlight_builtin_funcs != 0 - " Builtin functions - syn keyword pythonBuiltinFunc __import__ abs all any apply - syn keyword pythonBuiltinFunc basestring bin bool buffer bytearray bytes callable - syn keyword pythonBuiltinFunc chr classmethod cmp coerce compile complex +" +" Builtin functions +" + +if s:Enabled("g:python_highlight_builtin_funcs") + if s:Python2Syntax() + syn keyword pythonBuiltinFunc apply basestring buffer callable coerce + syn keyword pythonBuiltinFunc execfile file help intern long raw_input + syn keyword pythonBuiltinFunc reduce reload unichr unicode xrange + if s:Enabled("g:python_print_as_function") + syn keyword pythonBuiltinFunc print + endif + else + syn keyword pythonBuiltinFunc ascii exec memoryview print + endif + syn keyword pythonBuiltinFunc __import__ abs all any + syn keyword pythonBuiltinFunc bin bool bytearray bytes + syn keyword pythonBuiltinFunc chr classmethod cmp compile complex syn keyword pythonBuiltinFunc delattr dict dir divmod enumerate eval - syn keyword pythonBuiltinFunc execfile file filter float format frozenset getattr - syn keyword pythonBuiltinFunc globals hasattr hash help hex id - syn keyword pythonBuiltinFunc input int intern isinstance - syn keyword pythonBuiltinFunc issubclass iter len list locals long map max + syn keyword pythonBuiltinFunc filter float format frozenset getattr + syn keyword pythonBuiltinFunc globals hasattr hash hex id + syn keyword pythonBuiltinFunc input int isinstance + syn keyword pythonBuiltinFunc issubclass iter len list locals map max syn keyword pythonBuiltinFunc min next object oct open ord syn keyword pythonBuiltinFunc pow property range - syn keyword pythonBuiltinFunc raw_input reduce reload repr - syn keyword pythonBuiltinFunc reversed round set setattr + syn keyword pythonBuiltinFunc repr reversed round set setattr syn keyword pythonBuiltinFunc slice sorted staticmethod str sum super tuple - syn keyword pythonBuiltinFunc type unichr unicode vars xrange zip - - if exists("python_print_as_function") && python_print_as_function != 0 - syn keyword pythonBuiltinFunc print - endif + syn keyword pythonBuiltinFunc type vars zip endif -if exists("python_highlight_exceptions") && python_highlight_exceptions != 0 - " Builtin exceptions and warnings +" +" Builtin exceptions and warnings +" + +if s:Enabled("g:python_highlight_exceptions") + if s:Python2Syntax() + syn keyword pythonExClass StandardError + else + syn keyword pythonExClass BlockingIOError ChildProcessError + syn keyword pythonExClass ConnectionError BrokenPipeError + syn keyword pythonExClass ConnectionAbortedError ConnectionRefusedError + syn keyword pythonExClass ConnectionResetError FileExistsError + syn keyword pythonExClass FileNotFoundError InterruptedError + syn keyword pythonExClass IsADirectoryError NotADirectoryError + syn keyword pythonExClass PermissionError ProcessLookupError TimeoutError + + syn keyword pythonExClass ResourceWarning + endif syn keyword pythonExClass BaseException - syn keyword pythonExClass Exception StandardError ArithmeticError + syn keyword pythonExClass Exception ArithmeticError syn keyword pythonExClass LookupError EnvironmentError syn keyword pythonExClass AssertionError AttributeError BufferError EOFError @@ -298,7 +444,7 @@ if exists("python_highlight_exceptions") && python_highlight_exceptions != 0 syn keyword pythonExClass ImportWarning UnicodeWarning endif -if exists("python_slow_sync") && python_slow_sync != 0 +if s:Enabled("g:python_slow_sync") syn sync minlines=2000 else " This is fast but code inside triple quoted strings screws it up. It @@ -316,59 +462,68 @@ if version >= 508 || !exists("did_python_syn_inits") command -nargs=+ HiLink hi def link endif - HiLink pythonStatement Statement - HiLink pythonPreCondit Statement - HiLink pythonFunction Function - HiLink pythonConditional Conditional - HiLink pythonRepeat Repeat - HiLink pythonException Exception - HiLink pythonOperator Operator + HiLink pythonStatement Statement + HiLink pythonPreCondit Statement + HiLink pythonFunction Function + HiLink pythonConditional Conditional + HiLink pythonRepeat Repeat + HiLink pythonException Exception + HiLink pythonOperator Operator - HiLink pythonDecorator Define - HiLink pythonDottedName Function - HiLink pythonDot Normal + HiLink pythonDecorator Define + HiLink pythonDottedName Function + HiLink pythonDot Normal - HiLink pythonComment Comment - HiLink pythonCoding Special - HiLink pythonRun Special - HiLink pythonTodo Todo + HiLink pythonComment Comment + HiLink pythonCoding Special + HiLink pythonRun Special + HiLink pythonTodo Todo - HiLink pythonError Error - HiLink pythonIndentError Error - HiLink pythonSpaceError Error + HiLink pythonError Error + HiLink pythonIndentError Error + HiLink pythonSpaceError Error - HiLink pythonString String - HiLink pythonUniString String - HiLink pythonRawString String - HiLink pythonUniRawString String + HiLink pythonString String + HiLink pythonRawString String - HiLink pythonEscape Special - HiLink pythonEscapeError Error - HiLink pythonUniEscape Special - HiLink pythonUniEscapeError Error - HiLink pythonUniRawEscape Special - HiLink pythonUniRawEscapeError Error + HiLink pythonUniEscape Special + HiLink pythonUniEscapeError Error - HiLink pythonStrFormatting Special - HiLink pythonStrFormat Special - HiLink pythonStrTemplate Special + if s:Python2Syntax() + HiLink pythonUniString String + HiLink pythonUniRawString String + HiLink pythonUniRawEscape Special + HiLink pythonUniRawEscapeError Error + else + HiLink pythonBytes String + HiLink pythonRawBytes String + HiLink pythonBytesContent String + HiLink pythonBytesError Error + HiLink pythonBytesEscape Special + HiLink pythonBytesEscapeError Error + endif - HiLink pythonDocTest Special - HiLink pythonDocTest2 Special + HiLink pythonStrFormatting Special + HiLink pythonStrFormat Special + HiLink pythonStrTemplate Special - HiLink pythonNumber Number - HiLink pythonHexNumber Number - HiLink pythonOctNumber Number - HiLink pythonBinNumber Number - HiLink pythonFloat Float - HiLink pythonOctError Error - HiLink pythonHexError Error - HiLink pythonBinError Error + HiLink pythonDocTest Special + HiLink pythonDocTest2 Special - HiLink pythonBuiltinObj Structure - HiLink pythonBuiltinFunc Function + HiLink pythonNumber Number + HiLink pythonHexNumber Number + HiLink pythonOctNumber Number + HiLink pythonBinNumber Number + HiLink pythonFloat Float + HiLink pythonNumberError Error + HiLink pythonOctError Error + HiLink pythonHexError Error + HiLink pythonBinError Error - HiLink pythonExClass Structure + HiLink pythonBuiltinObj Structure + HiLink pythonBuiltinFunc Function + + HiLink pythonExClass Structure delcommand HiLink endif