Improve indent for async with statement

indent/python.vim

@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:    Python
 " Author:      Akinori Hattori <hattya@gmail.com>
-" Last Change: 2023-07-20
+" Last Change: 2023-07-21
 " License:     MIT License
 
 if exists('b:did_indent')
@@ -179,11 +179,11 @@ function! s:synmatch(lnum, col, pat) abort
 endfunction
 
 function! s:is_compound_stmt(str, ...) abort
-  return (a:0 && a:1 && a:str =~# '\v^\s*<%(%(async\s+)=def|class)>') || a:str =~# '\v^\s*<%(if|elif|while|%(async\s+)=for|except|with|match|case)>'
+  return (a:0 && a:1 && a:str =~# '\v^\s*<%(%(async\s+)=def|class)>') || a:str =~# '\v^\s*<%(if|elif|while|%(async\s+)=%(for|with)|except|match|case)>'
 endfunction
 
 function! s:matchkw(str) abort
-  return matchstr(a:str, '\v^\s*\zs<%(%(await|assert|del|return|yield%(\s+from)=|raise|import|from|global|nonlocal|if|elif|while|%(async\s+)=%(for|def)|with|match|case|class|async)>|except>%(\s*\*)=)')
+  return matchstr(a:str, '\v^\s*\zs<%(%(await|assert|del|return|yield%(\s+from)=|raise|import|from|global|nonlocal|if|elif|while|%(async\s+)=%(for|with|def)|match|case|class|async)>|except>%(\s*\*)=)')
 endfunction
 
 function! s:cont() abort

test/indent.vimspec

@@ -1208,6 +1208,58 @@ Describe filetype indent
           Assert Equals(Insert(in), Buffer(out))
         End
       End
+
+      Describe async with statement
+        It aligns with left brackets
+          let in  = "async with (spam,\<CR>eggs):"
+          let out = [
+          \  'async with (spam,',
+          \  '            eggs):',
+          \] ""        Assert Equals(Insert(in), Buffer(out))
+        End
+
+        It increases the indent level by 2
+          let b:python_indent_multiline_statement = 1
+          let in  = "async with (spam,\<CR>eggs):"
+          let out = [
+          \  'async with (spam,',
+          \  '                eggs):',
+          \]
+          Assert Equals(Insert(in), Buffer(out))
+        End
+
+        It increases the indent level (hanging indent)
+          let in  = "async with (\<CR>spam,\<CR>eggs,\<CR>):"
+          let out = [
+          \  'async with (',
+          \  '    spam,',
+          \  '    eggs,',
+          \  '):',
+          \]
+          Assert Equals(Insert(in), Buffer(out))
+        End
+
+        It increases the indent level by 2 (hanging indent)
+          let b:python_indent_multiline_statement = 1
+          let in  = "async with (\<CR>spam,\<CR>eggs,\<CR>):"
+          let out = [
+          \  'async with (',
+          \  '        spam,',
+          \  '        eggs,',
+          \  '):',
+          \]
+          Assert Equals(Insert(in), Buffer(out))
+        End
+
+        It increases the indent level (line continueation)
+          let in  = "async with spam, \\\<CR>eggs:"
+          let out = [
+          \  'async with spam, \',
+          \  '           eggs:',
+          \]
+          Assert Equals(Insert(in), Buffer(out))
+        End
+      End
     End
   End
 End