disabling highlighting of builtin functions is now really working

This commit is contained in:
Michael Doronin
2016-06-27 16:29:49 +03:00
parent 5881fdc81e
commit 036effcdf3

View File

@@ -416,7 +416,7 @@ if s:Enabled("g:python_highlight_builtin_objs")
syn keyword pythonBuiltinObj None syn keyword pythonBuiltinObj None
syn keyword pythonBoolean True False syn keyword pythonBoolean True False
syn keyword pythonBuiltinObj Ellipsis NotImplemented syn keyword pythonBuiltinObj Ellipsis NotImplemented
syn match pythonBuiltinObj '\v[^.]*<(int|float|tuple|str|list|dict|set|frozenset)>' syn match pythonBuiltinObj '\v(\.)@<!<(int|float|tuple|str|list|dict|set|frozenset)>'
syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__
endif endif
@@ -426,28 +426,28 @@ endif
if s:Enabled("g:python_highlight_builtin_funcs") if s:Enabled("g:python_highlight_builtin_funcs")
if s:Python2Syntax() if s:Python2Syntax()
syn match pythonBuiltinFunc 'v[^.]*<(apply|basestring|buffer|callable|coerce)>' syn match pythonBuiltinFunc '\v(\.)@<!<(apply|basestring|buffer|callable|coerce)>'
syn match pythonBuiltinFunc 'v[^.]*<(execfile|file|help|intern|long|raw_input)>' syn match pythonBuiltinFunc '\v(\.)@<!<(execfile|file|help|intern|long|raw_input)>'
syn match pythonBuiltinFunc 'v[^.]*<(reduce|reload|unichr|unicode|xrange)>' syn match pythonBuiltinFunc '\v(\.)@<!<(reduce|reload|unichr|unicode|xrange)>'
if s:Enabled("g:python_print_as_function") if s:Enabled("g:python_print_as_function")
syn match pythonBuiltinFunc 'v[^.]*<(print)>' syn match pythonBuiltinFunc '\v(\.)@<!<(print)>'
endif endif
else else
syn match pythonBuiltinFunc 'v[^.]*<(ascii|exec|memoryview|print)>' syn match pythonBuiltinFunc '\v(\.)@<!<(ascii|exec|memoryview|print)>'
endif endif
syn match pythonBuiltinFunc 'v[^.]*<(__import__|abs|all|any)>' syn match pythonBuiltinFunc '\v(\.)@<!<(__import__|abs|all|any)>'
syn match pythonBuiltinFunc 'v[^.]*<(bin|bool|bytearray|bytes)>' syn match pythonBuiltinFunc '\v(\.)@<!<(bin|bool|bytearray|bytes)>'
syn match pythonBuiltinFunc 'v[^.]*<(chr|classmethod|cmp|compile|complex)>' syn match pythonBuiltinFunc '\v(\.)@<!<(chr|classmethod|cmp|compile|complex)>'
syn match pythonBuiltinFunc 'v[^.]*<(delattr|dir|divmod|enumerate|eval)>' syn match pythonBuiltinFunc '\v(\.)@<!<(delattr|dir|divmod|enumerate|eval)>'
syn match pythonBuiltinFunc 'v[^.]*<(filter|format|getattr)>' syn match pythonBuiltinFunc '\v(\.)@<!<(filter|format|getattr)>'
syn match pythonBuiltinFunc 'v[^.]*<(globals|hasattr|hash|hex|id)>' syn match pythonBuiltinFunc '\v(\.)@<!<(globals|hasattr|hash|hex|id)>'
syn match pythonBuiltinFunc 'v[^.]*<(input|isinstance)>' syn match pythonBuiltinFunc '\v(\.)@<!<(input|isinstance)>'
syn match pythonBuiltinFunc 'v[^.]*<(issubclass|iter|len|locals|map|max)>' syn match pythonBuiltinFunc '\v(\.)@<!<(issubclass|iter|len|locals|map|max)>'
syn match pythonBuiltinFunc 'v[^.]*<(min|next|object|oct|open|ord)>' syn match pythonBuiltinFunc '\v(\.)@<!<(min|next|object|oct|open|ord)>'
syn match pythonBuiltinFunc 'v[^.]*<(pow|property|range)>' syn match pythonBuiltinFunc '\v(\.)@<!<(pow|property|range)>'
syn match pythonBuiltinFunc 'v[^.]*<(repr|reversed|round|setattr)>' syn match pythonBuiltinFunc '\v(\.)@<!<(repr|reversed|round|setattr)>'
syn match pythonBuiltinFunc 'v[^.]*<(slice|sorted|staticmethod|sum|super)>' syn match pythonBuiltinFunc '\v(\.)@<!<(slice|sorted|staticmethod|sum|super)>'
syn match pythonBuiltinFunc 'v[^.]*<(type|vars|zip)>' syn match pythonBuiltinFunc '\v(\.)@<!<(type|vars|zip)>'
endif endif
" "