update packages

lisp/yasnippet-snippets/snippets/bibtex-mode/.yas-setup.el

@@ -1,3 +1,4 @@
+;;; -*- lexical-binding: t -*-
 (require 'yasnippet)
 (require 'yasnippet-snippets)
 

lisp/yasnippet-snippets/snippets/bibtex-mode/bookinbook

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: bookinbook
 # key: bookinbook
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @bookinbook{ ${title},
 author    = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/collection

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: collection
 # key: collection
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @collection{ ${title},
   editor    = {${editor}},

lisp/yasnippet-snippets/snippets/bibtex-mode/dataset

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: dataset
 # key: dataset
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @dataset{ ${title}
   title        = {${title}},

lisp/yasnippet-snippets/snippets/bibtex-mode/electronic

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: electronic
 # key: electronic
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @electronic{ ${title},
 author  = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/inreference

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: inreference
 # key: inreference
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @inreference{ ${title},
 author    = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/mvbook

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: mvbook
 # key: mvbook
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @mvbook{ ${title},
   author    = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/mvcollection

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: mvcollection
 # key: mvcollection
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @mvcollection{ ${title},
   editor    = {${editor}},

lisp/yasnippet-snippets/snippets/bibtex-mode/mvreference

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: mvereference
 # key: mvreference
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @mvreference{ ${title},
 editor    = {${editor}},

lisp/yasnippet-snippets/snippets/bibtex-mode/online

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: online
 # key: online
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @online{ ${title},
   author  = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/patent

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: patent
 # key: patent
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @patent{ ${title},
   title  = {${title}},

lisp/yasnippet-snippets/snippets/bibtex-mode/periodical

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: periodical
 # key: periodical
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @periodical{ ${title}
 editor     = {${editor}},

lisp/yasnippet-snippets/snippets/bibtex-mode/reference

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: reference
 # key: reference
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @reference{ ${title},
 editor    = {${editor}},

lisp/yasnippet-snippets/snippets/bibtex-mode/report

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: report
 # key: report
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @report{ ${title},
   author       = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/set

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: set
 # key: set
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @set{${title},
   entryset = {${entryset}}

lisp/yasnippet-snippets/snippets/bibtex-mode/suppbook

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: suppbook
 # key: suppbook
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @suppbook{ ${title},
 author    = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/suppcollection

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: suppcollection
 # key: suppcollection
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @suppcollection{ ${title},
 author    = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/suppperiodical

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: suppperiodical
 # key: suppperiodical
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @suppperiodical{ ${title},
 author  = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/thesis

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: thesis
 # key: thesis
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @thesis{ ${title},
 author  = {${author}},

lisp/yasnippet-snippets/snippets/bibtex-mode/xdata

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: xdata
 # key: xdata
-# author: Spenser Truex
+# contributor: Spenser Truex
 # --
 @xdata{ ${title},
   $0

lisp/yasnippet-snippets/snippets/c++-mode/.yas-setup.el

@@ -1,3 +1,4 @@
+;;; -*- lexical-binding: t -*-
 (require 'yasnippet)
 
 (defun yas-c++-class-name (str)

lisp/yasnippet-snippets/snippets/c++-mode/class11

@@ -4,17 +4,19 @@
 # group: c++11
 # uuid: d7c41f87-9b8a-479d-bb12-89f4cbdd46a7
 # contributor: Ved Vyas
-# desc: Snippet for C++11 classes based on c++-mode/class. Allows for Rule of
-# [0, All]. A choice between ";", " = default;", and " = delete;" is presented
-# for each method. The methods and some of the optional keywords/specifiers are
-# exposed as fields that users can easily skip-and-clear.
-# Hackish query-replace-regexp to renumber non-mirror fields in the region
-# between public and protected (can use N as a field number in the snippet):
-# \${[0-9N]*:\([^\$]\) -> ${\,(+ 2 \#):\1
-# References:
-# 1. http://en.cppreference.com/w/cpp/language/rule_of_three#Rule_of_five
-# 2. https://en.wikipedia.org/wiki/Rule_of_three_%28C%2B%2B_programming%29#Example_in_C.2B.2B
-# 3. http://stackoverflow.com/a/4782927
+#
+## Snippet for C++11 classes based on c++-mode/class. Allows for Rule of
+## [0, All]. A choice between ";", " = default;", and " = delete;" is presented
+## for each method. The methods and some of the optional keywords/specifiers are
+## exposed as fields that users can easily skip-and-clear.
+## Hackish query-replace-regexp to renumber non-mirror fields in the region
+## between public and protected (can use N as a field number in the snippet):
+## \${[0-9N]*:\([^\$]\) -> ${\,(+ 2 \#):\1
+##
+## References
+## 1. http://en.cppreference.com/w/cpp/language/rule_of_three#Rule_of_five
+## 2. https://en.wikipedia.org/wiki/Rule_of_three_%28C%2B%2B_programming%29#Example_in_C.2B.2B
+## 3. http://stackoverflow.com/a/4782927
 # --
 class ${1:Name}
 {

lisp/yasnippet-snippets/snippets/c++-mode/forr

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: for range
+# key: forr
+# --
+for (${1:type} ${2:name} : ${3:containerName}) {
+    $0
+}

lisp/yasnippet-snippets/snippets/c++-mode/lambda

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: lambda
+# key: lambda
+# --
+[${1:capture clause}](${2:parameters}) {
+    $0
+}

lisp/yasnippet-snippets/snippets/cc-mode/file_description

@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-#cotributor: Henrique Jung <henriquenj@gmail.com>
+# contributor: Henrique Jung <henriquenj@gmail.com>
 # name: File description
 # key: \file
 # group: doxygen

lisp/yasnippet-snippets/snippets/cc-mode/function_description

@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-#cotributor: Henrique Jung <henriquenj@gmail.com>
+# contributor: Henrique Jung <henriquenj@gmail.com>
 # name: Function description
 # key: \brief
 # group: doxygen

lisp/yasnippet-snippets/snippets/cc-mode/member_description

@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-#cotributor: Henrique Jung <henriquenj@gmail.com>
+# contributor: Henrique Jung <henriquenj@gmail.com>
 # name: Member description
 # key: !<
 # group: doxygen

lisp/yasnippet-snippets/snippets/js-mode/for

@@ -1,6 +1,6 @@
 # -*- mode: snippet; require-final-newline: nil -*-
 # name: for
 # --
-for (var ${1:i} = ${2:0}; $1 < ${3:collection}.length; $1++) {
+for (let ${1:i} = ${2:0}; $1 < ${3:collection}.length; $1++) {
   $0
 }

lisp/yasnippet-snippets/snippets/latex-mode/corollary

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: corollary
+# key: corr
+# --
+\begin{cor}[${2:title}]
+  \label{cor:${1:label}}
+  $0
+\end{cor}

lisp/yasnippet-snippets/snippets/latex-mode/lemma

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: lemma
+# key: lem
+# --
+\begin{lem}[${2:title}]
+  \label{lem:${1:label}}
+  $0
+\end{lem}

lisp/yasnippet-snippets/snippets/latex-mode/theorem

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: theorem
+# key: thm
+# --
+\begin{thm}[${2:title}]
+  \label{thm:${1:label}}
+  $0
+\end{thm}

lisp/yasnippet-snippets/snippets/php-mode/.yas-setup.el

@@ -1,4 +1,4 @@
-;;; .yas-setup.el --- Yasnippet helper functions for PHP snippets
+;;; .yas-setup.el --- Yasnippet helper functions for PHP snippets -*- lexical-binding: t -*-
 
 ;;; Commentary:
 

lisp/yasnippet-snippets/snippets/php-mode/strict-types

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # contributor: USAMI Kenta <tadsan@zonu.me>
-# name: declare(ticks=)
-# key: ticks
+# name: declare(strict_types=1)
+# key: strict_types
 # group: definitions
 # --
-declare(ticks=${1:1});
+declare(strict_types=1);

lisp/yasnippet-snippets/snippets/prog-mode/.yas-setup.el

@@ -1,3 +1,4 @@
+;;; -*- lexical-binding: t -*-
 (require 'yasnippet)
 
 ;; whitespace removing functions from Magnar Sveen ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -28,9 +29,17 @@
   "This function returns `comment-start' trimmed by whitespaces."
   (yas-s-trim comment-start))
 
+(defun yas-trimmed-add-comment ()
+  "This function returns `comment-start' trimmed by whitespaces. It uses
+`comment-add' to determine how many comment symbols to insert."
+  (yas-s-trim (apply #'concat (mapcar (lambda (x)
+                                        comment-start)
+                                      (number-sequence 0 comment-add)))))
+
 (defun yas-trimmed-comment-end ()
-  "This function returns `comment-end' trimmed by whitespaces if `comment-end' is not empty.
-Otherwise the reversed output of function `yas-trimmed-comment-start' is returned."
+  "This function returns `comment-end' trimmed by whitespaces if
+`comment-end' is not empty. Otherwise the reversed output of
+function `yas-trimmed-comment-start' is returned."
   (if (eq (length comment-end) 0)
       (yas-string-reverse (yas-trimmed-comment-start))
     (yas-s-trim comment-end)))

lisp/yasnippet-snippets/snippets/prog-mode/commentblock

@@ -15,15 +15,20 @@ ${1:$(let* ((col (current-column))
 ${1:$(let* ((col (current-column))
            (str "")
            (start (yas-trimmed-comment-start))
+           (start (if (string= start ";") ";;" start))
            (end (yas-trimmed-comment-end)))
          (while (< (length str) (ffloor (/ (- 78.0 (+ col (length start) (string-width yas-text) (length end))) 2.0)))
                 (setq str (concat str " ")))
-        (concat start str))} ${1:comment} ${1:$(let* ((col (current-column))
-                                                     (str "")
-                                                     (start (yas-trimmed-comment-start))
-                                                     (end (yas-trimmed-comment-end)))
-                                                   (while (< (length str) (- 79.0 (if (eq (mod (string-width yas-text) 2) 1) (- col 1) col) (length end)))
-                                                          (setq str (concat str " ")))
+        (concat start str))} ${1:comment} ${1:$(
+        let* ((col (current-column))
+              (str "")
+              (start (yas-trimmed-comment-start))
+              (start (if (string= start ";") ";;" start))
+              (end (yas-trimmed-comment-end)))
+              (while (< (length str)
+                        (- 79 (length end)
+                           (if (eq (mod (+ (string-width yas-text) (length start) (length end)) 2) 1) (- col 1) col)))
+              (setq str (concat str " ")))
                                                  (concat str end))}
 ${1:$(let* ((col (current-column))
            (str "")

lisp/yasnippet-snippets/snippets/prog-mode/fixme

@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: fixme
 # key: fi
-# condition: (not (eq major-mode 'sh-mode))
+# condition: (not (member major-mode '(sh-mode bash-ts-mode)))
 # --
 `comment-start`FIXME: $0`comment-end`

lisp/yasnippet-snippets/snippets/prog-mode/spdxcopyright

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# contributor: Antero Mejr <mail@antr.me>
+# name: spdxcopyright
+# key: spc
+# --
+`(yas-trimmed-add-comment)` SPDX-FileCopyrightText: $0`comment-end`

lisp/yasnippet-snippets/snippets/prog-mode/spdxlicense

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# contributor: Antero Mejr <mail@antr.me>
+# name: spdxlicense
+# key: spl
+# --
+`(yas-trimmed-add-comment)` SPDX-License-Identifier: $0`comment-end`

lisp/yasnippet-snippets/snippets/python-mode/.yas-setup.el

@@ -1,23 +1,34 @@
+;;; -*- lexical-binding: t -*-
 (require 'yasnippet)
 (defvar yas-text)
 
+(defvar python-split-arg-arg-regex
+"\\([[:alnum:]*]+\\)\\(:[[:blank:]]*[[:alpha:]]*\\)?\\([[:blank:]]*=[[:blank:]]*[[:alnum:]]*\\)?"
+"Regular expression matching an argument of a python function.
+First group should give the argument name.")
+
+(defvar python-split-arg-separator
+"[[:space:]]*,[[:space:]]*"
+"Regular expression matching the separator in a list of argument.")
+
 (defun python-split-args (arg-string)
-  "Split a python argument string into ((name, default)..) tuples"
+  "Split a python argument string ARG-STRING into a tuple of argument names."
   (mapcar (lambda (x)
-             (split-string x "[[:blank:]]*=[[:blank:]]*" t))
-          (split-string arg-string "[[:blank:]]*,[[:blank:]]*" t)))
+            (when (string-match python-split-arg-arg-regex x)
+              (match-string-no-properties 1 x)))
+          (split-string arg-string python-split-arg-separator t)))
 
 (defun python-args-to-docstring ()
-  "return docstring format for the python arguments in yas-text"
+  "Return docstring format for the python arguments in yas-text."
   (let* ((indent (concat "\n" (make-string (current-column) 32)))
          (args (python-split-args yas-text))
          (max-len (if args (apply 'max (mapcar (lambda (x) (length (nth 0 x))) args)) 0))
          (formatted-args (mapconcat
-                (lambda (x)
-                   (concat (nth 0 x) (make-string (- max-len (length (nth 0 x))) ? ) " -- "
-                           (if (nth 1 x) (concat "\(default " (nth 1 x) "\)"))))
-                args
-                indent)))
+                          (lambda (x)
+                            (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))))
 
@@ -33,6 +44,3 @@
                  (list "\nParameters\n----------" formatted-params
                        "\nReturns\n-------" formatted-ret)
                  "\n"))))
-
-
-(add-hook 'python-mode-hook #'yasnippet-snippets--fixed-indent)

lisp/yasnippet-snippets/snippets/python-mode/__abs__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __abs__
+# key: _abs
+# group: Special methods
+# --
+def __abs__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__add__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __add__
+# key: _add
+# group: Special methods
+# --
+def __add__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__aenter__

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: __aenter__
+# key: _aenter
+# group: Special methods
+# --
+async def __aenter__(self):
+    $0
+    return self

lisp/yasnippet-snippets/snippets/python-mode/__aexit__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __aexit__
+# key: _aexit
+# group: Special methods
+# --
+async def __aexit__(self, exc_type, exc_value, traceback):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__aiter__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __aiter__
+# key: _aiter
+# group: Special methods
+# --
+def __aiter__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__and__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __and__
+# key: _and
+# group: Special methods
+# --
+def __and__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__anext__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __anext__
+# key: _anext
+# group: Special methods
+# --
+async def __anext__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__await__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __await__
+# key: _await
+# group: Special methods
+# --
+def __await__(self):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__bool__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __bool__
+# key: _bool
+# group: Special methods
+# --
+def __bool__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__bytes__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __bytes__
+# key: _bytes
+# group: Special methods
+# --
+def __bytes__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__call__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __call__
+# key: _call
+# group: Special methods
+# --
+def __call__(self, ${1:*args}):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ceil__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ceil__
+# key: _ceil
+# group: Special methods
+# --
+def __ceil__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__class_getitem__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __class_getitem__
+# key: _class_getitem
+# group: Special methods
+# --
+def __class_getitem__(cls, key):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__cmp__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __cmp__
+# key: _cmp
+# group: Special methods
+# --
+def __cmp__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__complex__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __complex__
+# key: _complex
+# group: Special methods
+# --
+def __complex__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__contains__

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: __contains__
-# key: cont
-# group: dunder methods
+# key: _contains
+# group: Special methods
 # --
-def __contains__(self, el):
-    $0
+def __contains__(self, item):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__del__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __del__
+# key: _del
+# group: Special methods
+# --
+def __del__(self):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__delattr__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __delattr__
+# key: _delattr
+# group: Special methods
+# --
+def __delattr__(self, name):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__delete__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __delete__
+# key: _delete
+# group: Special methods
+# --
+def __delete__(self, instance):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__delitem__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __delitem__
+# key: _delitem
+# group: Special methods
+# --
+def __delitem__(self, key):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__dir__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __dir__
+# key: _dir
+# group: Special methods
+# --
+def __dir__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__div__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __div__
+# key: _div
+# group: Special methods
+# --
+def __div__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__divmod__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __divmod__
+# key: _divmod
+# group: Special methods
+# --
+def __divmod__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__enter__

@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: __enter__
-# key: ent
-# group: dunder methods
+# key: _enter
+# group: Special methods
 # --
 def __enter__(self):
     $0
 
-    return self
+    return self

lisp/yasnippet-snippets/snippets/python-mode/__eq__

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: __eq__
-# key: eq
-# group: dunder methods
+# key: _eq
+# group: Special methods
 # --
 def __eq__(self, other):
-    return self.$1 == other.$1
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__exit__

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: __exit__
-# key: ex
-# group: dunder methods
+# key: _exit
+# group: Special methods
 # --
-def __exit__(self, type, value, traceback):
-    $0
+def __exit__(self, exc_type, exc_value, traceback):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__float__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __float__
+# key: _float
+# group: Special methods
+# --
+def __float__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__floor__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __floor__
+# key: _floor
+# group: Special methods
+# --
+def __floor__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__floordiv__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __floordiv__
+# key: _floordiv
+# group: Special methods
+# --
+def __floordiv__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__format__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __format__
+# key: _format
+# group: Special methods
+# --
+def __format__(self, format_spec):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ge__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ge__
+# key: _ge
+# group: Special methods
+# --
+def __ge__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__get__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __get__
+# key: _get
+# group: Special methods
+# --
+def __get__(self, instance, owner=None):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__getattr__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __getattr__
+# key: _getattr
+# group: Special methods
+# --
+def __getattr__(self, name):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__getattribute__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __getattribute__
+# key: _getattribute
+# group: Special methods
+# --
+def __getattribute__(self, name):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__getitem__

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: __getitem__
-# key: getit
-# group: dunder methods
+# key: _getitem
+# group: Special methods
 # --
-def __getitem__(self, ${1:key}):
-    $0
+def __getitem__(self, key):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__gt__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __gt__
+# key: _gt
+# group: Special methods
+# --
+def __gt__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__hash__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __hash__
+# key: _hash
+# group: Special methods
+# --
+def __hash__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__iadd__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __iadd__
+# key: _iadd
+# group: Special methods
+# --
+def __iadd__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__iand__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __iand__
+# key: _iand
+# group: Special methods
+# --
+def __iand__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__idiv__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __idiv__
+# key: _idiv
+# group: Special methods
+# --
+def __idiv__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ifloordiv__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ifloordiv__
+# key: _ifloordiv
+# group: Special methods
+# --
+def __ifloordiv__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ilshift__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ilshift__
+# key: _ilshift
+# group: Special methods
+# --
+def __ilshift__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__imatmul__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __imatmul__
+# key: _imatmul
+# group: Special methods
+# --
+def __imatmul__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__imod__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __imod__
+# key: _imod
+# group: Special methods
+# --
+def __imod__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__imul__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __imul__
+# key: _imul
+# group: Special methods
+# --
+def __imul__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__index__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __index__
+# key: _index
+# group: Special methods
+# --
+def __index__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__init__

@@ -1,8 +1,8 @@
 # -*- mode: snippet -*-
-# name: init
-# key: init
+# name: __init__
+# key: _init
 # group : definitions
 # --
 def __init__(self${1:, args}):
     ${2:"${3:docstring}"
-    }$0
+    }$0

lisp/yasnippet-snippets/snippets/python-mode/__init_subclass__

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: __init_subclass__
+# key: _init_subclass
+# group: Special methods
+# --
+def __init_subclass__(cls, /${1:, param}, **kwargs):
+    super().__init_subclass__(**kwargs)
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__instancecheck__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __instancecheck__
+# key: _instancecheck
+# group: Special methods
+# --
+def __instancecheck__(self, instance):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__int__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __int__
+# key: _int
+# group: Special methods
+# --
+def __int__(self):
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__invert__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __invert__
+# key: _invert
+# group: Special methods
+# --
+def __invert__(self):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ior__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ior__
+# key: _ior
+# group: Special methods
+# --
+def __ior__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ipow__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ipow__
+# key: _ipow
+# group: Special methods
+# --
+def __ipow__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__irshift__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __irshift__
+# key: _irshift
+# group: Special methods
+# --
+def __irshift__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__isub__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __isub__
+# key: _isub
+# group: Special methods
+# --
+def __isub__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__iter__

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: __iter__
-# key: iter
-# group: dunder methods
+# key: _iter
+# group: Special methods
 # --
 def __iter__(self):
-    return ${1:iter($2)}
+    $0

lisp/yasnippet-snippets/snippets/python-mode/__itruediv__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __itruediv__
+# key: _itruediv
+# group: Special methods
+# --
+def __itruediv__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__ixor__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __ixor__
+# key: _ixor
+# group: Special methods
+# --
+def __ixor__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__le__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __le__
+# key: _le
+# group: Special methods
+# --
+def __le__(self, other):
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__len__

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: __len__
-# key: len
-# group: dunder methods
+# key: _len
+# group: Special methods
 # --
 def __len__(self):
-    $0
+    return $0

lisp/yasnippet-snippets/snippets/python-mode/__length_hint__

@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: __length_hint__
+# key: _length_hint
+# group: Special methods
+# --
+def __length_hint__(self):
+    return $0