Highlight class vars inside f-strings

syntax/python.vim

@@ -54,6 +54,7 @@ if s:Enabled('g:python_highlight_all')
   call s:EnableByDefault('g:python_highlight_space_errors')
   call s:EnableByDefault('g:python_highlight_doctests')
   call s:EnableByDefault('g:python_print_as_function')
+  call s:EnableByDefault('g:python_highlight_class_names')
   call s:EnableByDefault('g:python_highlight_class_vars')
   call s:EnableByDefault('g:python_highlight_operators')
 endif
@@ -64,13 +65,17 @@ 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=pythonFunction skipwhite
+syn keyword pythonStatement     def nextgroup=pythonFunction skipwhite
+if s:Enabled('g:python_highlight_class_names')
+    syn keyword pythonStatement     class nextgroup=pythonClassName skipwhite
+    syn match   pythonClassName    '\%([[:upper:]][^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*' display contained
+endif
 if s:Enabled('g:python_highlight_class_vars')
   syn keyword pythonClassVar    self cls
 endif
 syn keyword pythonRepeat        for while
 syn keyword pythonConditional   if elif else
-syn keyword pythonException     try except finally
+syn keyword pythonExceptions     try except finally
 " The standard pyrex.vim unconditionally removes the pythonInclude group, so
 " we provide a dummy group here to avoid crashing pyrex.vim.
 syn keyword pythonInclude       import
@@ -88,12 +93,9 @@ if s:Python2Syntax()
   syn match   pythonFunction    '[a-zA-Z_][a-zA-Z0-9_]*' display contained
 else
   syn keyword pythonStatement   as nonlocal
-  syn match   pythonStatement   '\v\.@<!<await>'
+  syn keyword pythonAsync       async await
   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
+  syn cluster pythonExpression contains=pythonStatement,pythonRepeat,pythonConditional,pythonOperator,pythonNumber,pythonHexNumber,pythonOctNumber,pythonBinNumber,pythonFloat,pythonString,pythonBytes,pythonBoolean,pythonNone,pythonSingleton,pythonBuiltinObj,pythonBuiltinFunc,pythonBuiltinType,pythonClassVar
 endif
 
 
@@ -414,8 +416,10 @@ if v:version >= 508 || !exists('did_python_syn_inits')
 
   HiLink pythonStatement        Statement
   HiLink pythonRaiseFromStatement   Statement
+  HiLink pythonAsync            Statement
   HiLink pythonImport           Include
   HiLink pythonFunction         Function
+  HiLink pythonClassName        Structure
   HiLink pythonConditional      Conditional
   HiLink pythonRepeat           Repeat
   HiLink pythonException        Exception
@@ -456,7 +460,7 @@ if v:version >= 508 || !exists('did_python_syn_inits')
     HiLink pythonBytesEscapeError   Error
     HiLink pythonFString            String
     HiLink pythonRawFString         String
-    HiLink pythonStrInterpRegion    Special
+    HiLink pythonStrInterpRegion    Ignored
   endif
 
   HiLink pythonStrFormatting    Special
@@ -485,7 +489,7 @@ if v:version >= 508 || !exists('did_python_syn_inits')
   HiLink pythonBuiltinType      Structure
 
   HiLink pythonExClass          Structure
-  HiLink pythonClassVar         Identifier
+  HiLink pythonClassVar         Special
 
   delcommand HiLink
 endif

tests/test.py

@@ -8,20 +8,53 @@
 
 # Keywords.
 
-with break continue del return pass raise global assert lambda yield
-for while if elif else import as try except finally
-
 from test import var as name
 
+import as
+with break continue del return pass raise global assert lambda yield
+async await
+for while if elif else try except finally
+while True:
+    continue; break; return; yield
+
+try:
+    v = int(0.1)
+    raise RuntimeError()
+except:
+    pass
+else:
+    pass
+finally:
+    pass
+
 raise Exception from ex
 
 yield from
 
+with open() as f_x:
+    pass
+
 def functionname
 class Classname
+class classname
 def функция
 class Класс
+class класс
+
+class A:
+    def __new__(cls):
+        super()
+        pass
 
+    def method(self):
+        print(f'{self.__class__.__name__}')
+        var = a_var(kw=True)
+        afloat = 0.1
+        print(f'The float is {afloat + 1}')
+
+
+if __name__ == '__main__':
+    main()
 # Keywords: Python 2
 
 exec
@@ -40,6 +73,10 @@ async def Test
 
 __debug__ __doc__ __file__ __name__ __package__ __loader__ __spec__ __path__ __cached__
 
+# Dunders
+__slots__ __all__ __version__ __qualname__ __module__ __defaults__ __code__
+__globals__ __dict__ __closure__ __annotations__ __kwdefaults__
+
 # Bultin types
 
 bool bytearray dict float frozenset int list object set str tuple
@@ -241,6 +278,11 @@ async def Test
 f'brackets: {{ 1 + 2 }} and {{{{ 3 + 4 }}}}'
 fr'this {that}'
 
+
+class Atest:
+    def amethod(self):
+        print(f"{self.__name__}")
+
 # Doctests.
 
 """