Update yasnippet .yas-setup.el

3 files changed, 32 insertions, 9 deletions

diff --git a/.emacs.d/snippets/prog-mode/.yas-setup.el b/.emacs.d/snippets/prog-mode/.yas-setup.el
index 22a8168..486ae47 100644
--- a/.emacs.d/snippets/prog-mode/.yas-setup.el
+++ b/.emacs.d/snippets/prog-mode/.yas-setup.el
@@ -1,8 +1,5 @@
 (require 'yasnippet)
 
-(defun yas-with-comment (str)
-  (format "%s%s%s" comment-start str comment-end))
-
 ;; whitespace removing functions from Magnar Sveen ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defun yas-s-trim-left (s)
   "Remove whitespace at the beginning of S."
diff --git a/.emacs.d/snippets/python-mode.statnett/.yas-setup.el b/.emacs.d/snippets/python-mode.statnett/.yas-setup.el
index 7603e4d..76af532 100644
--- a/.emacs.d/snippets/python-mode.statnett/.yas-setup.el
+++ b/.emacs.d/snippets/python-mode.statnett/.yas-setup.el
@@ -14,12 +14,25 @@
          (max-len (if args (apply 'max (mapcar (lambda (x) (length (nth 0 x))) args)) 0))
          (formatted-args (mapconcat
                 (lambda (x)
-                   (concat ":param " (nth 0 x) ":\n:type " (nth 0 x) ":\n"
+                   (concat (nth 0 x) (make-string (- max-len (length (nth 0 x))) ? ) " -- "
                            (if (nth 1 x) (concat "\(default " (nth 1 x) "\)"))))
                 args
                 indent)))
     (unless (string= formatted-args "")
       (mapconcat 'identity (list "Keyword Arguments:" formatted-args) indent))))
 
-(add-hook 'python-mode-hook
-          '(lambda () (set (make-local-variable 'yas-indent-line) 'fixed)))
+(defun python-args-to-docstring-numpy ()
+  "return docstring format for the python arguments in yas-text"
+  (let* ((args (python-split-args yas-text))
+         (format-arg (lambda(arg)
+                       (concat (nth 0 arg) " : " (if (nth 1 arg) ", optional") "\n")))
+         (formatted-params (mapconcat format-arg args "\n"))
+         (formatted-ret (mapconcat format-arg (list (list "out")) "\n")))
+    (unless (string= formatted-params "")
+      (mapconcat 'identity
+                 (list "\nParameters\n----------" formatted-params
+                       "\nReturns\n-------" formatted-ret)
+                 "\n"))))
+
+
+(add-hook 'python-mode-hook #'yasnippet-snippets--fixed-indent)
diff --git a/.emacs.d/snippets/python-mode/.yas-setup.el b/.emacs.d/snippets/python-mode/.yas-setup.el
index 7603e4d..76af532 100644
--- a/.emacs.d/snippets/python-mode/.yas-setup.el
+++ b/.emacs.d/snippets/python-mode/.yas-setup.el
@@ -14,12 +14,25 @@
          (max-len (if args (apply 'max (mapcar (lambda (x) (length (nth 0 x))) args)) 0))
          (formatted-args (mapconcat
                 (lambda (x)
-                   (concat ":param " (nth 0 x) ":\n:type " (nth 0 x) ":\n"
+                   (concat (nth 0 x) (make-string (- max-len (length (nth 0 x))) ? ) " -- "
                            (if (nth 1 x) (concat "\(default " (nth 1 x) "\)"))))
                 args
                 indent)))
     (unless (string= formatted-args "")
       (mapconcat 'identity (list "Keyword Arguments:" formatted-args) indent))))
 
-(add-hook 'python-mode-hook
-          '(lambda () (set (make-local-variable 'yas-indent-line) 'fixed)))
+(defun python-args-to-docstring-numpy ()
+  "return docstring format for the python arguments in yas-text"
+  (let* ((args (python-split-args yas-text))
+         (format-arg (lambda(arg)
+                       (concat (nth 0 arg) " : " (if (nth 1 arg) ", optional") "\n")))
+         (formatted-params (mapconcat format-arg args "\n"))
+         (formatted-ret (mapconcat format-arg (list (list "out")) "\n")))
+    (unless (string= formatted-params "")
+      (mapconcat 'identity
+                 (list "\nParameters\n----------" formatted-params
+                       "\nReturns\n-------" formatted-ret)
+                 "\n"))))
+
+
+(add-hook 'python-mode-hook #'yasnippet-snippets--fixed-indent)