8000 Remove dead keywords and builtins; add match, case · python-mode/python-mode@d090c73 · GitHub
[go: up one dir, main page]
Skip to content

Commit d090c73

Browse files
NeilGirdharNeilGirdhar
committed
Remove dead keywords and builtins; add match, case
1 parent 50ced6b commit d090c73

File tree

1 file changed

+29
-26
lines changed

1 file changed

+29
-26
lines changed

‎syntax/python.vim

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ endif
9494
syn match pythonClassParameters "[^,\*]*" contained contains=pythonBuiltin,pythonBuiltinObj,pythonBuiltinType,pythonExtraOperatorpythonStatement,pythonBrackets,pythonString,pythonComment skipwhite
9595

9696
syn keyword pythonRepeat for while
97-
syn keyword pythonConditional if elif else
97+
syn keyword pythonConditional if elif else match case
9898
syn keyword pythonInclude import from
9999
syn keyword pythonException try except finally
100100
syn keyword pythonOperator and in is not or
@@ -269,26 +269,29 @@ endif
269269

270270
" Builtin objects and types
271271
if g:pymode_syntax_builtin_objs
272-
syn keyword pythonBuiltinObj True False Ellipsis None NotImplemented
273-
syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__
272+
" True, False, Ellipsis, and None are in fact keywords.
273+
syn keyword pythonBuiltinObj True False Ellipsis None
274+
syn keyword pythonBuiltinObj NotImplemented
275+
syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ __loader__
276+
syn keyword pythonBuiltinObj __spec__ __cached__ __annotations__
274277
endif
275278

276279
if g:pymode_syntax_builtin_types
277280
syn keyword pythonBuiltinType type object
278-
syn keyword pythonBuiltinType str basestring unicode buffer bytearray bytes chr unichr
279-
syn keyword pythonBuiltinType dict int long bool float complex set frozenset list tuple
280-
syn keyword pythonBuiltinType file super
281+
syn keyword pythonBuiltinType str bytearray bytes chr
282+
syn keyword pythonBuiltinType dict int bool float complex set frozenset list tuple
283+
syn keyword pythonBuiltinType super
281284
endif
282285

283286
" Builtin functions
284287
if g:pymode_syntax_builtin_funcs
285-
syn keyword pythonBuiltinFunc __import__ abs all any apply
286-
syn keyword pythonBuiltinFunc bin callable classmethod cmp coerce compile
288+
syn keyword pythonBuiltinFunc __import__ abs all any
289+
syn keyword pythonBuiltinFunc bin callable classmethod compile
287290
syn keyword pythonBuiltinFunc delattr dir divmod enumerate eval execfile filter
288291
syn keyword pythonBuiltinFunc format getattr globals locals hasattr hash help hex id
289-
syn keyword pythonBuiltinFunc input intern isinstance issubclass iter len map max min
290-
syn keyword pythonBuiltinFunc next oct open ord pow property range xrange
291-
syn keyword pythonBuiltinFunc raw_input reduce reload repr reversed round setattr
292+
syn keyword pythonBuiltinFunc input isinstance issubclass iter len map max min
293+
syn keyword pythonBuiltinFunc next oct open ord pow property range
294+
syn keyword pythonBuiltinFunc repr reversed round setattr
292295
syn keyword pythonBuiltinFunc slice sorted staticmethod sum vars zip
293296

294297
if g:pymode_syntax_print_as_function
@@ -299,31 +302,31 @@ endif
299302

300303
" Builtin exceptions and warnings
301304
if g:pymode_syntax_highlight_exceptions
302-
syn keyword pythonExClass BaseException
303-
syn keyword pythonExClass Exception StandardError ArithmeticError
304-
syn keyword pythonExClass LookupError EnvironmentError
305-
syn keyword pythonExClass AssertionError AttributeError BufferError EOFError
306-
syn keyword pythonExClass FloatingPointError GeneratorExit IOError
307-
syn keyword pythonExClass ImportError IndexError KeyError
308-
syn keyword pythonExClass KeyboardInterrupt MemoryError NameError
305+
syn keyword pythonExClass BaseException Exception ArithmeticError
306+
syn keyword pythonExClass BufferError LookupError
307+
syn keyword pythonExClass AssertionError AttributeError EOFError
308+
syn keyword pythonExClass FloatingPointError GeneratorExit
309+
syn keyword pythonExClass ImportError ModuleNotFoundError IndexError
310+
syn keyword pythonExClass KeyError KeyboardInterrupt MemoryError NameError
309311
syn keyword pythonExClass NotImplementedError OSError OverflowError
310-
syn keyword pythonExClass ReferenceError RuntimeError StopIteration
311-
syn keyword pythonExClass SyntaxError IndentationError TabError
312+
syn keyword pythonExClass RecursionError ReferenceError RuntimeError StopIteration
313+
syn keyword pythonExClass StopAsyncIteration SyntaxError IndentationError TabError
312314
syn keyword pythonExClass SystemError SystemExit TypeError
313315
syn keyword pythonExClass UnboundLocalError UnicodeError
314316
syn keyword pythonExClass UnicodeEncodeError UnicodeDecodeError
315-
syn keyword pythonExClass UnicodeTranslateError ValueError VMSError
317+
syn keyword pythonExClass UnicodeTranslateError ValueError
318+
syn keyword pythonExClass ZeroDivisionError EnvironmentError IOError
319+
syn keyword pythonExClass WindowsError
316320
syn keyword pythonExClass BlockingIOError ChildProcessError ConnectionError
317321
syn keyword pythonExClass BrokenPipeError ConnectionAbortedError
318322
syn keyword pythonExClass ConnectionRefusedError ConnectionResetError
319323
syn keyword pythonExClass FileExistsError FileNotFoundError InterruptedError
320324
syn keyword pythonExClass IsADirectoryError NotADirectoryError PermissionError
321325
syn keyword pythonExClass ProcessLookupError TimeoutError
322-
syn keyword pythonExClass WindowsError ZeroDivisionError
323-
syn keyword pythonExClass Warning UserWarning BytesWarning DeprecationWarning
324-
syn keyword pythonExClass PendingDepricationWarning SyntaxWarning
325-
syn keyword pythonExClass RuntimeWarning FutureWarning
326-
syn keyword pythonExClass ImportWarning UnicodeWarning
326+
syn keyword pythonExClass Warning UserWarning DeprecationWarning PendingDeprecationWarning
327+
syn keyword pythonExClass SyntaxWarning RuntimeWarning FutureWarning
328+
syn keyword pythonExClass ImportWarning UnicodeWarning EncodingWarning
329+
syn keyword pythonExClass BytesWarning ResourceWarning
327330
endif
328331

329332
" }}}

0 commit comments

Comments
 (0)
0