builtins now show up in function definitions

klen · klen · commit 8318c1647b3a · 2013-12-01T21:22:05.000+07:00
diff --git a/AUTHORS b/AUTHORS
@@ -7,7 +7,7 @@ Contributors:
 
 * Alvin Francis (alvinfrancis);
 * Anler Hp (ikame);
-* Anton Parkhomenko
+* Anton Parkhomenko (chuwy);
 * Benjamin Ruston (bruston);
 * Boris Filippov (frenzykryger);
 * David Vogt (winged);
@@ -20,10 +20,11 @@ Contributors:
 * Kevin Deldycke (kdeldycke);
 * Lowe Thiderman (thiderman);
 * Martin Brochhaus (mbrochh);
-* Matthew Moses (mlmoses)
+* Matthew Moses (mlmoses);
 * Mohammed (mbadran);
 * Naoya Inada (naoina);
 * Pedro Algarvio (s0undt3ch);
+* Phillip Cloud (cpcloud);
 * Piet Delport (pjdelport);
 * Robert David Grant (bgrant);
 * Ronald Andreu Kaiser (cathoderay);
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -72,15 +72,16 @@ endif
     syn keyword pythonStatement exec return
     syn keyword pythonStatement pass raise
     syn keyword pythonStatement global nonlocal assert
-    syn keyword pythonStatement lambda yield
+    syn keyword pythonStatement yield
+    syn keyword pythonLambdaExpr lambda
     syn keyword pythonStatement with as
 
     syn keyword pythonStatement def nextgroup=pythonFunction skipwhite
     syn match pythonFunction "\%(\%(def\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonVars
     syn region pythonVars start="(" end=")" contained contains=pythonParameters transparent keepend
-    syn match pythonParameters "[^,]*" contained contains=pythonExtraOperator,pythonParam skipwhite
-    syn match pythonParam "=[^,]*" contained contains=pythonBuiltinObj,pythonBuiltinType,pythonConstant,pythonStatement,pythonNumber,pythonString,pythonNumber,pythonBrackets skipwhite
-    syn match pythonBrackets "[(|)]" contained skipwhite
+    syn match pythonParameters "[^,]*" contained contains=pythonParam skipwhite
+    syn match pythonParam "[^,]*" contained contains=pythonExtraOperator,pythonLambdaExpr,pythonBuiltinObj,pythonBuiltinType,pythonConstant,pythonString,pythonNumber,pythonBrackets,pythonSelf skipwhite
+    syn match pythonBrackets "{[(|)]}" contained skipwhite
 
     syn keyword pythonStatement class nextgroup=pythonClass skipwhite
     syn match pythonClass "\%(\%(class\s\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonClassVars
@@ -325,6 +326,7 @@ endif
 " =============
 
     hi def link  pythonStatement    Statement
+    hi def link  pythonLambdaExpr   Statement
     hi def link  pythonInclude      Include
     hi def link  pythonFunction     Function
     hi def link  pythonClass        Type
