|
@@ -166,7 +166,7 @@ syn keyword pythonImport import
|
166
|
166
|
syn match pythonIdentifier "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" nextgroup=pythonFuncArgs,pythonTypeAnno display
|
167
|
167
|
syn keyword pythonException try except finally
|
168
|
168
|
syn keyword pythonOperator and in is not or
|
169
|
|
-syn match pythonLambdaExpr "\<lambda[^:]*:"he=s+6 display contains=@pythonExpression nextgroup=@pythonExpression
|
|
169
|
+syn match pythonLambdaExpr "\<lambda[^:]*:"he=s+6 contains=@pythonExpression nextgroup=@pythonExpression
|
170
|
170
|
|
171
|
171
|
syn region pythonDictSetExpr matchgroup=pythonDictSetExpr start='{' end='}' contains=@pythonExpression
|
172
|
172
|
syn region pythonListSliceExpr matchgroup=pythonListSliceExpr start='\[' end='\]' contains=@pythonExpression
|
|
@@ -174,8 +174,8 @@ syn region pythonFuncArgs matchgroup=pythonFuncArgs start='(' end=')' cont
|
174
|
174
|
|
175
|
175
|
if !s:Python2Syntax()
|
176
|
176
|
if s:Enabled("g:python_highlight_type_annotations")
|
177
|
|
- syn match pythonTypeAnno @:\s*['"]\?\([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\([^[:cntrl:][:punct:][:space:]]\|_\)*['"]\?@hs=s+1 display contained contains=pythonType,pythonString nextgroup=pythonTypeArgs
|
178
|
|
- syn match pythonTypeAnnoReturn @->\s*['"]\?\([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\([^[:cntrl:][:punct:][:space:]]\|_\)*['"]\?@ display contains=pythonType,pythonString nextgroup=pythonTypeArgs
|
|
177
|
+ syn match pythonTypeAnno @:\s*['"]\?\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\)*['"]\?@hs=s+1 display contained contains=pythonType,pythonString nextgroup=pythonTypeArgs
|
|
178
|
+ syn match pythonTypeAnnoReturn @->\s*['"]\?\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\)*['"]\?@ display contains=pythonType,pythonString nextgroup=pythonTypeArgs
|
179
|
179
|
syn region pythonTypeArgs matchgroup=pythonTypeArgs start='\[' end='\]' display contained contains=pythonType,pythonString,pythonTypeArgs
|
180
|
180
|
syn keyword pythonType Any AnyStr Callable ClassVar Tuple Union Optional Type TypeVar None contained
|
181
|
181
|
syn keyword pythonType AbstractSet MutableSet Mapping MutableMapping Sequence MutableSequence ByteString Deque List contained
|