Fix dict params include bug (#62)

* Fix dict params include bug

* Fix remove debug print

Author: heavenshell

autoload/pydocstring.vim

@@ -60,7 +60,7 @@ function! s:compare(lhs, rhs)
   return a:lhs['start'] - a:rhs['start']
 endfunction
 
-function! s:parse_args(args_str)
+function! s:parse_args_with_types(args_str)
   " FIXME Very very work around.
   " If Python2 is dead, consider to use Python interface
   let args_str = copy(a:args_str)
@@ -154,11 +154,32 @@ function! s:parse_args(args_str)
   return map(args, {i, v -> substitute(v['val'], ',', ', ', 'g')})
 endfunction
 
+function! s:parse_args(args_str) abort
+  " TODO FIXME Work around
+  let args_str = copy(a:args_str)
+
+  let args_str = substitute(args_str, '"', "'", 'g')
+
+  let pattern = "'[A-z0-9_-]\+':[A-z0-9.-_]\+"
+  let args_str = substitute(args_str, "\\v'[A-z0-9_-]\+':[A-z0-9.-_'\"]\+", '', 'g')
+  let args_str = substitute(args_str, '=\({,\+}\|{}\)', '', 'g')
+  let args_str = substitute(args_str, '\[.*]', '', 'g')
+  let args = split(args_str, ',')
+
+  return args
+endfunction
+
 function! s:parse_func(type, line)
   let header = substitute(a:line, '\s\|(.*\|:', '', 'g')
 
   let args_str = substitute(a:line, '\s\|.*(\|).*', '', 'g')
   if args_str =~ ':' && args_str =~ '['
+    if match(args_str, '[A-z0-9_$]\+:') >= 0
+      let args = s:parse_args_with_types(args_str)
+    else
+      let args = s:parse_args(args_str)
+    endif
+  elseif args_str =~ '=' && (args_str =~ '{' || args_str =~ '[')
     let args = s:parse_args(args_str)
   elseif args_str =~ ':'
     let args = split(args_str, ',')

test/issue_with_dict.vader

@@ -0,0 +1,87 @@
+# vim:set et sw=4 ts=4 tw=79:
+Given python (def foo with dict params):
+    def get_adjacency(
+        facets,
+        points=None,
+        max_degree=None,
+        dtypes={'ints': np.int64, 'floats': np.float32},
+    ):
+        pass
+
+Execute:
+    Pydocstring
+
+Expect python:
+    def get_adjacency(
+        facets,
+        points=None,
+        max_degree=None,
+        dtypes={'ints': np.int64, 'floats': np.float32},
+    ):
+        """get_adjacency
+
+        :param facets:
+        :param points:
+        :param max_degree:
+        :param dtypes:
+        """
+        pass
+
+Given python (def foo with list params):
+    def get_adjacency(
+        facets,
+        points=None,
+        max_degree=None,
+        dtypes=['ints', 'floats'],
+    ):
+        pass
+
+Execute:
+    Pydocstring
+
+Expect python:
+    def get_adjacency(
+        facets,
+        points=None,
+        max_degree=None,
+        dtypes=['ints', 'floats'],
+    ):
+        """get_adjacency
+
+        :param facets:
+        :param points:
+        :param max_degree:
+        :param dtypes:
+        """
+        pass
+
+Given python (def foo with list and dict params):
+    def get_adjacency(
+        facets,
+        points=None,
+        max_degree=None,
+        dtypes={'ints': np.int64, 'floats': np.float32},
+        etypes=['ints', 'floats'],
+    ):
+        pass
+
+Execute:
+    Pydocstring
+
+Expect python:
+    def get_adjacency(
+        facets,
+        points=None,
+        max_degree=None,
+        dtypes={'ints': np.int64, 'floats': np.float32},
+        etypes=['ints', 'floats'],
+    ):
+        """get_adjacency
+
+        :param facets:
+        :param points:
+        :param max_degree:
+        :param dtypes:
+        :param etypes:
+        """
+        pass