Merge branch 'fix_nested_indent'

Author: heavenshell

CHANGES.rst

@@ -1,3 +1,11 @@
+Version 0.0.7
+-------------
+Released on June 1th 2016
+
+- add ``_nested_indent_`` template variable.
+  see https://github.com/heavenshell/vim-pydocstring/issues/3#issuecomment-222584162
+  Thx @pirDOL
+
 Version 0.0.6
 -------------
 Released on January 17th 2016

autoload/pydocstring.vim

@@ -1,6 +1,6 @@
 " Insert Docstring.
 " Author:      Shinya Ohyanagi <sohyanagi@gmail.com>
-" Version:     0.0.6
+" Version:     0.0.7
 " License:     This file is placed in the public domain.
 " WebPage:     http://github.com/heavenshell/vim-pydocstriong/
 " Description: Generate Python docstring to your Python script file.
@@ -76,7 +76,7 @@ function! s:readoneline(indent, prefix)
   return tmpl
 endfunction
 
-function! s:builddocstring(strs, indent)
+function! s:builddocstring(strs, indent, nested_indent)
   let type  = a:strs['type']
   let prefix = a:strs['header']
   let args = a:strs['args']
@@ -108,6 +108,7 @@ function! s:builddocstring(strs, indent)
           let arg = substitute(line, '{{_arg_}}', arg, 'g')
           let arg = substitute(arg, '{{_lf_}}', "\n", '')
           let arg = substitute(arg, '{{_indent_}}', a:indent, 'g')
+          let arg = substitute(arg, '{{_nested_indent_}}', a:nested_indent, 'g')
           call add(docstrings, a:indent . arg)
         endfor
       elseif line =~ '{{_indent_}}'
@@ -165,13 +166,15 @@ function! pydocstring#insert()
       call s:insert(startpos, indent . tmpl)
     endif
   else
+    let space = repeat(' ', &softtabstop)
+    let nested_indent = space
     if len(indent) == 0
-      let indent = repeat(' ', &softtabstop)
+      let indent = space
     else
-      let indent = indent . repeat(' ', &softtabstop)
+      let indent = indent . space
     endif
     try
-      let result = s:builddocstring(docstring, indent)
+      let result = s:builddocstring(docstring, indent, nested_indent)
       call s:insert(insertpos + 1, result)
     catch /^Template/
       echomsg v:exception

doc/pydocstring.txt

@@ -139,6 +139,7 @@ Template variables.
   |{{_arg_}}|	Assign function or method's argument.
   |{{_ln_}}|	Assign line break.
   |{{_indent_}}|	Assign indent.
+  |{{_nested_indent_}}|	Assign indent.
 
 ==============================================================================
 VARIABLES					*pydocstring-vim-variables*
@@ -199,6 +200,33 @@ Numpy style docstring template example.
     """
     pass
 
+Nested indent example.
+
+  Add following template to multi.txt
+>
+    """{{_header_}}
+
+    {{_indent_}}Args:
+    {{_nested_indent_}}{{_arg_}}:
+    """
+<
+  Set cursor on `def arg1` line and type following.
+>
+    :Pydocstring
+<
+  Then docstring put under `def` line.
+>
+  class Foo(object):
+    def foo(self, arg1, arg2):
+        """foo
+
+        Args:
+            arg1:
+            arg2:
+        """
+        pass
+<
+
 Override default mapping.
 
   Add following setting to your .vimrc or _vimrc.

ftplugin/python/pydocstring.vim

@@ -1,6 +1,6 @@
 " File:     pydocstring.vim
 " Author:   Shinya Ohyanagi <sohyanagi@gmail.com>
-" Version:  0.0.6
+" Version:  0.0.7
 " WebPage:  http://github.com/heavenshell/vim-pydocstriong/
 " Description: Generate Python docstring to your Python script file.
 " License: BSD, see LICENSE for more details.