Preserve backwards compatibility for pythonFunction

Related to #63
vim-python · Feb 26, 2020 · 6ce77d0 · 6ce77d0
1 parent f73fbf0
commit 6ce77d0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -73,7 +73,7 @@ endif
 
 syn keyword pythonStatement     break continue del return pass yield global assert lambda with
 syn keyword pythonStatement     raise nextgroup=pythonExClass skipwhite
-syn keyword pythonStatement     def class nextgroup=pythonFunctionContained skipwhite
+syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
 if s:Enabled('g:python_highlight_class_vars')
     syn keyword pythonClassVar    self cls
 endif
@@ -94,12 +94,12 @@ if s:Python2Syntax()
     endif
     syn keyword pythonStatement   exec
     syn keyword pythonImport      as
-    syn match   pythonFunctionContained    '[a-zA-Z_][a-zA-Z0-9_]*' display contained
+    syn match   pythonFunction    '[a-zA-Z_][a-zA-Z0-9_]*' display contained
 else
     syn keyword pythonStatement   as nonlocal
     syn match   pythonStatement   '\v\.@<!<await>'
-    syn match   pythonFunctionContained    '\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*' display contained
-    syn match   pythonStatement   '\<async\s\+def\>' nextgroup=pythonFunctionContained skipwhite
+    syn match   pythonFunction    '\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*' display contained
+    syn match   pythonStatement   '\<async\s\+def\>' nextgroup=pythonFunction skipwhite
     syn match   pythonStatement   '\<async\s\+with\>'
     syn match   pythonStatement   '\<async\s\+for\>'
     syn cluster pythonExpression contains=pythonStatement,pythonRepeat,pythonConditional,pythonOperator,pythonNumber,pythonHexNumber,pythonOctNumber,pythonBinNumber,pythonFloat,pythonString,pythonBytes,pythonBoolean,pythonNone,pythonSingleton,pythonBuiltinObj,pythonBuiltinFunc,pythonBuiltinType
@@ -428,8 +428,8 @@ if v:version >= 508 || !exists('did_python_syn_inits')
     HiLink pythonStatement        Statement
     HiLink pythonRaiseFromStatement   Statement
     HiLink pythonImport           Include
-    HiLink pythonFunctionContained         Function
-    HiLink pythonFunctionCall         Function
+    HiLink pythonFunction         Function
+    HiLink pythonFunctionCall     Function
     HiLink pythonConditional      Conditional
     HiLink pythonRepeat           Repeat
     HiLink pythonException        Exception