From dec4b0814e7cc6f025474088dc92422672f84ea3 Mon Sep 17 00:00:00 2001 From: nfnty Date: Thu, 16 Feb 2017 18:39:19 +0100 Subject: [PATCH] linting with vint --- .vintrc.yaml | 3 + syntax/python.vim | 290 +++++++++++++++++++++++----------------------- 2 files changed, 148 insertions(+), 145 deletions(-) create mode 100644 .vintrc.yaml diff --git a/.vintrc.yaml b/.vintrc.yaml new file mode 100644 index 0000000..b371660 --- /dev/null +++ b/.vintrc.yaml @@ -0,0 +1,3 @@ +policies: + ProhibitImplicitScopeVariable: + enabled: false diff --git a/syntax/python.vim b/syntax/python.vim index 07a78f9..97959b3 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -88,9 +88,9 @@ " For version 5.x: Clear all syntax items " For versions greater than 6.x: Quit when a syntax file was already loaded -if version < 600 +if v:version < 600 syntax clear -elseif exists("b:current_syntax") +elseif exists('b:current_syntax') finish endif @@ -114,32 +114,32 @@ endfunction " Is it Python 2 syntax? function! s:Python2Syntax() - if exists("b:python_version_2") + if exists('b:python_version_2') return b:python_version_2 endif - return s:Enabled("g:python_version_2") + return s:Enabled('g:python_version_2') endfunction " " Default options " -call s:EnableByDefault("g:python_slow_sync") +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") +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") + 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 " @@ -162,28 +162,28 @@ syn keyword pythonConditional if elif else " we provide a dummy group here to avoid crashing pyrex.vim. syn keyword pythonException try except finally syn keyword pythonOperator and in is not or -syn match pythonStatement "\s*\([.,]\)\@" +syn match pythonStatement '\s*\([.,]\)\@' syn keyword pythonInclude import syn keyword pythonImport import -syn match pythonIdentifier "\v[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters -syn match pythonRaiseFromStatement "from\>" -syn match pythonImport "^\s*\zsfrom\>" +syn match pythonIdentifier '\v[a-zA-Z_][a-zA-Z0-9_]*' nextgroup=FunctionParameters +syn match pythonRaiseFromStatement 'from\>' +syn match pythonImport '^\s*\zsfrom\>' if s:Python2Syntax() - if !s:Enabled("g:python_print_as_function") + if !s:Enabled('g:python_print_as_function') syn keyword pythonStatement print endif syn keyword pythonImport as - syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained + syn match pythonFunction '[a-zA-Z_][a-zA-Z0-9_]*' nextgroup=FunctionParameters display contained else syn keyword pythonStatement as nonlocal - syn match pythonStatement "\v(\.)@" - syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained - syn match pythonStatement "\" nextgroup=pythonFunction skipwhite - syn match pythonStatement "\" - syn match pythonStatement "\" + syn match pythonStatement '\v(\.)@' + syn match pythonFunction '[a-zA-Z_][a-zA-Z0-9_]*' nextgroup=FunctionParameters display contained + syn match pythonStatement '\' nextgroup=pythonFunction skipwhite + syn match pythonStatement '\' + syn match pythonStatement '\' endif syn region FunctionParameters start='(' end=')' display contains= @@ -218,43 +218,43 @@ syn match OptionalParameters /\i*\ze=/ display contained " Decorators (new in Python 2.4) " -syn match pythonDecorator "@" display nextgroup=pythonDottedName skipwhite +syn match pythonDecorator '@' display nextgroup=pythonDottedName skipwhite if s:Python2Syntax() - syn match pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\%(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained nextgroup=FunctionParameters + syn match pythonDottedName '[a-zA-Z_][a-zA-Z0-9_]*\%(\.[a-zA-Z_][a-zA-Z0-9_]*\)*' display contained nextgroup=FunctionParameters else - syn match pythonDottedName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\)*" display contained nextgroup=FunctionParameters + syn match pythonDottedName '\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\)*' display contained nextgroup=FunctionParameters endif -syn match pythonDot "\." display containedin=pythonDottedName +syn match pythonDot '\.' display containedin=pythonDottedName " " Comments " -syn match pythonComment "#.*$" display contains=pythonTodo,@Spell -if !s:Enabled("g:python_highlight_file_headers_as_comments") - syn match pythonRun "\%^#!.*$" - syn match pythonCoding "\%^.*\%(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$" +syn match pythonComment '#.*$' display contains=pythonTodo,@Spell +if !s:Enabled('g:python_highlight_file_headers_as_comments') + syn match pythonRun '\%^#!.*$' + syn match pythonCoding '\%^.*\%(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$' endif -syn keyword pythonTodo TODO FIXME XXX contained +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 +syn match pythonError '\<\d\+\D\+\>' display +syn match pythonError '[$?]' display +syn match pythonError '[&|]\{2,}' display +syn match pythonError '[=]\{3,}' 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 +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 s:Enabled("g:python_highlight_space_errors") - syn match pythonSpaceError "\s\+$" display +if s:Enabled('g:python_highlight_space_errors') + syn match pythonSpaceError '\s\+$' display endif " @@ -270,28 +270,28 @@ if s:Python2Syntax() 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 + 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 - syn match pythonBytesError ".\+" display contained - syn match pythonBytesContent "[\u0000-\u00ff]\+" display contained contains=pythonBytesEscape,pythonBytesEscapeError + syn match pythonBytesError '.\+' display contained + syn match pythonBytesContent '[\u0000-\u00ff]\+' display contained contains=pythonBytesEscape,pythonBytesEscapeError endif 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 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 +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 @@ -314,8 +314,8 @@ if s:Python2Syntax() 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 + syn match pythonUniRawEscape '\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}' display contained + syn match pythonUniRawEscapeError '\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X' display contained endif " Python 2/3 raw strings @@ -338,45 +338,45 @@ endif syn match pythonRawEscape +\\['"]+ display transparent contained -if s:Enabled("g:python_highlight_string_formatting") +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 + 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 + 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") +if s:Enabled('g:python_highlight_string_format') " str.format syntax 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 + 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 + 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 s:Enabled("g:python_highlight_string_templates") +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 + 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 + 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 s:Enabled("g:python_highlight_doctests") +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 + 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 " @@ -384,91 +384,91 @@ endif " 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 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 pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display - syn match pythonOctNumber "\<0[oO]\o\+[lL]\=\>" display - syn match pythonBinNumber "\<0[bB][01]\+[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 - 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 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 + 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 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 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 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 + 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\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>' display +syn match pythonFloat '\<\d\+[eE][+-]\=\d\+[jJ]\=\>' display +syn match pythonFloat '\<\d\+\.\d*\%([eE][+-]\=\d\+\)\=[jJ]\=' display " " Builtin objects and types " -if s:Enabled("g:python_highlight_builtin_objs") +if s:Enabled('g:python_highlight_builtin_objs') syn keyword pythonNone None - syn keyword pythonBoolean True False - syn keyword pythonBuiltinObj Ellipsis NotImplemented - syn match pythonBuiltinObj '\v(\.)@' nextgroup=FunctionParameters - syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ - syn keyword pythonBuiltinObj __loader__ __spec__ __path__ __cached__ + syn keyword pythonBoolean True False + syn keyword pythonBuiltinObj Ellipsis NotImplemented + syn match pythonBuiltinObj '\v(\.)@' nextgroup=FunctionParameters + syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ + syn keyword pythonBuiltinObj __loader__ __spec__ __path__ __cached__ endif " " Builtin functions " -if s:Enabled("g:python_highlight_builtin_funcs") +if s:Enabled('g:python_highlight_builtin_funcs') if s:Python2Syntax() - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - if s:Enabled("g:python_print_as_function") - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + if s:Enabled('g:python_print_as_function') + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters endif else - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters endif - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters - syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters + syn match pythonBuiltinFunc '\v(\.)@\ze\(' nextgroup=FunctionParameters endif " " Builtin exceptions and warnings " -if s:Enabled("g:python_highlight_exceptions") +if s:Enabled('g:python_highlight_exceptions') if s:Python2Syntax() syn match pythonExClass '\v(\.)@' nextgroup=FunctionParameters else @@ -502,18 +502,18 @@ if s:Enabled("g:python_highlight_exceptions") syn match pythonExClass '\v(\.)@' nextgroup=FunctionParameters endif -if s:Enabled("g:python_slow_sync") +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 " is impossible to fix because the only way to know if you are inside a " triple quoted string is to start from the beginning of the file. - syn sync match pythonSync grouphere NONE "):$" + syn sync match pythonSync grouphere NONE '):$' syn sync maxlines=200 endif -if version >= 508 || !exists("did_python_syn_inits") - if version <= 508 +if v:version >= 508 || !exists('did_python_syn_inits') + if v:version <= 508 let did_python_syn_inits = 1 command -nargs=+ HiLink hi link else @@ -534,7 +534,7 @@ if version >= 508 || !exists("did_python_syn_inits") HiLink pythonDot Normal HiLink pythonComment Comment - if !s:Enabled("g:python_highlight_file_headers_as_comments") + if !s:Enabled('g:python_highlight_file_headers_as_comments') HiLink pythonCoding Special HiLink pythonRun Special endif @@ -595,4 +595,4 @@ if version >= 508 || !exists("did_python_syn_inits") delcommand HiLink endif -let b:current_syntax = "python" +let b:current_syntax = 'python'