Improve indent for with statement

Author: hattya

indent/python.vim

@@ -137,7 +137,11 @@ function! GetPEP8PythonIndent() abort
   elseif getline(v:lnum - 1) =~# s:lcont
     " line continuation
     if s:is_compound_stmt(ll)
-      let ind += s:ml_stmt() ? shiftwidth() * 2 : shiftwidth()
+      if ll =~# '\v^\s*<with>'
+        let ind += len('with') + 1
+      else
+        let ind += s:ml_stmt() ? shiftwidth() * 2 : shiftwidth()
+      endif
     else
       let ind += s:cont()
     endif

test/indent.vimspec

@@ -492,6 +492,15 @@ Describe filetype indent
       Assert Equals(Insert(in), Buffer(out))
     End
 
+    It indents the with statement (line continuation)
+      let in  = "with open('a') as fp1, \\\<CR>open('b') as fp2:"
+      let out = [
+      \  'with open(''a'') as fp1, \',
+      \  '     open(''b'') as fp2:',
+      \]
+      Assert Equals(Insert(in), Buffer(out))
+    End
+
     It indents compound statements (line continuation)
       let in  = "def func():\<CR>"
       let in .= "\\\<CR>0\<C-D>if 1:\<CR>pass\<CR>"