fix indent (was 3 spaces) of snippets for python-mode

This commit is contained in:
Zhang Chiyuan 2008-04-25 15:01:39 +00:00
parent 6c51fd8e21
commit db6a74078f
10 changed files with 112 additions and 106 deletions

View File

@ -6,6 +6,12 @@ ChangeLog
:Contact: pluskid@gmail.com :Contact: pluskid@gmail.com
:Date: 2008-03-22 :Date: 2008-03-22
0.5.2 / 2008-04-20
==================
* Fix a bug for comparing string to symbol using ``string=`` (which
will fire an error).
0.5.1 / 2008-04-14 0.5.1 / 2008-04-14
================== ==================

View File

@ -5,50 +5,50 @@
# contributor: Yasser González Fernández <yglez@uh.cu> # contributor: Yasser González Fernández <yglez@uh.cu>
# -- # --
class ${1:ClassName}(${2:object}): class ${1:ClassName}(${2:object}):
"""$3 """$3
""" """
def __init__(self, $4): def __init__(self, $4):
"""$5 """$5
${4:$ ${4:$
(let* ((indent (let* ((indent
(concat "\n" (make-string (current-column) 32))) (concat "\n" (make-string (current-column) 32)))
(args (args
(mapconcat (mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
'(lambda (x) '(lambda (x)
(mapcar (if (not (string= (nth 0 x) ""))
(lambda (x) (concat "- " (char-to-string 96) (nth 0 x)
(replace-regexp-in-string "\s*$" "" (char-to-string 96) ":")))
(replace-regexp-in-string "^\s*" "" x))) x)) (mapcar
(mapcar '(lambda (x) (split-string x "=")) '(lambda (x)
(split-string text ","))) (mapcar
indent))) (lambda (x)
(if (string= args "") (replace-regexp-in-string "\s*$" ""
(make-string 3 34) (replace-regexp-in-string "^\s*" "" x))) x))
(mapconcat (mapcar '(lambda (x) (split-string x "="))
'identity (split-string text ",")))
(list "" "Arguments:" args (make-string 3 34)) indent)))
indent))) (if (string= args "")
} (make-string 3 34)
${4:$ (mapconcat
(mapconcat 'identity
'(lambda (x) (list "" "Arguments:" args (make-string 3 34))
(if (not (string= (nth 0 x) "")) indent)))
(concat "self._" (nth 0 x) " = " (nth 0 x)))) }
(mapcar ${4:$
(mapconcat
'(lambda (x) '(lambda (x)
(mapcar (if (not (string= (nth 0 x) ""))
'(lambda (x) (concat "self._" (nth 0 x) " = " (nth 0 x))))
(replace-regexp-in-string "\s*$" "" (mapcar
(replace-regexp-in-string "^\s*" "" x))) '(lambda (x)
x)) (mapcar
(mapcar '(lambda (x) (split-string x "=")) '(lambda (x)
(split-string text ","))) (replace-regexp-in-string "\s*$" ""
(concat "\n" (make-string (current-column) 32))) (replace-regexp-in-string "^\s*" "" x)))
} x))
$0 (mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
(concat "\n" (make-string (current-column) 32)))
}
$0

View File

@ -4,31 +4,31 @@
# contributor: Yasser González Fernández <yglez@uh.cu> # contributor: Yasser González Fernández <yglez@uh.cu>
# -- # --
def ${1:name}($2): def ${1:name}($2):
"""$3 """$3
${2:$ ${2:$
(let* ((indent (let* ((indent
(concat "\n" (make-string (current-column) 32))) (concat "\n" (make-string (current-column) 32)))
(args (args
(mapconcat (mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
'(lambda (x) '(lambda (x)
(mapcar (if (not (string= (nth 0 x) ""))
'(lambda (x) (concat "- " (char-to-string 96) (nth 0 x)
(replace-regexp-in-string "\s*$" "" (char-to-string 96) ":")))
(replace-regexp-in-string "^\s*" "" x))) (mapcar
x)) '(lambda (x)
(mapcar '(lambda (x) (split-string x "=")) (mapcar
(split-string text ","))) '(lambda (x)
indent))) (replace-regexp-in-string "\s*$" ""
(if (string= args "") (replace-regexp-in-string "^\s*" "" x)))
(make-string 3 34) x))
(mapconcat (mapcar '(lambda (x) (split-string x "="))
'identity (split-string text ",")))
(list "" "Arguments:" args (make-string 3 34)) indent)))
indent))) (if (string= args "")
} (make-string 3 34)
$0 (mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
$0

View File

@ -3,31 +3,31 @@
# contributor: Yasser Gonz¨¢lez Fern¨¢ndez <yglez@uh.cu> # contributor: Yasser Gonz¨¢lez Fern¨¢ndez <yglez@uh.cu>
# -- # --
def ${1:name}(self, $2): def ${1:name}(self, $2):
"""$3 """$3
${2:$ ${2:$
(let* ((indent (let* ((indent
(concat "\n" (make-string (current-column) 32))) (concat "\n" (make-string (current-column) 32)))
(args (args
(mapconcat (mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
'(lambda (x) '(lambda (x)
(mapcar (if (not (string= (nth 0 x) ""))
'(lambda (x) (concat "- " (char-to-string 96) (nth 0 x)
(replace-regexp-in-string "\s*$" "" (char-to-string 96) ":")))
(replace-regexp-in-string "^\s*" "" x))) (mapcar
x)) '(lambda (x)
(mapcar '(lambda (x) (split-string x "=")) (mapcar
(split-string text ","))) '(lambda (x)
indent))) (replace-regexp-in-string "\s*$" ""
(if (string= args "") (replace-regexp-in-string "^\s*" "" x)))
(make-string 3 34) x))
(mapconcat (mapcar '(lambda (x) (split-string x "="))
'identity (split-string text ",")))
(list "" "Arguments:" args (make-string 3 34)) indent)))
indent))) (if (string= args "")
} (make-string 3 34)
$0 (mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
$0

View File

@ -2,7 +2,7 @@
#name : _get_foo ... foo=property(...) #name : _get_foo ... foo=property(...)
# -- # --
def _get_${1:foo}(self): def _get_${1:foo}(self):
return self._$1 return self._$1
$1 = property(_get_$1) $1 = property(_get_$1)

View File

@ -2,10 +2,10 @@
#name : _get_foo ... _set_foo ... foo=property(...) #name : _get_foo ... _set_foo ... foo=property(...)
# -- # --
def _set_${1:foo}(self, value): def _set_${1:foo}(self, value):
self._$1 = value self._$1 = value
def _get_$1(self): def _get_$1(self):
return self._$1 return self._$1
$1 = property(_get_$1, _set_$1) $1 = property(_get_$1, _set_$1)

View File

@ -1,3 +1,3 @@
#name : attr_reader ... #name : attr_reader ...
# -- # --
attr_reader :${attr_names} attr_reader :

View File

@ -1,3 +1,3 @@
#name : attr_accessor ... #name : attr_accessor ...
# -- # --
attr_accessor :{attr_names} attr_accessor :

View File

@ -1,3 +1,3 @@
#name : attr_writer ... #name : attr_writer ...
# -- # --
attr_writer :${attr_names} attr_writer :

View File

@ -3,7 +3,7 @@
;; Copyright 2008 pluskid ;; Copyright 2008 pluskid
;; ;;
;; Author: pluskid <pluskid@gmail.com> ;; Author: pluskid <pluskid@gmail.com>
;; Version: 0.5.1 ;; Version: 0.5.2
;; X-URL: http://code.google.com/p/yasnippet/ ;; X-URL: http://code.google.com/p/yasnippet/
;; This file is free software; you can redistribute it and/or modify ;; This file is free software; you can redistribute it and/or modify
@ -178,7 +178,7 @@ to expand.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Internal variables ;; Internal variables
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar yas/version "0.5.1") (defvar yas/version "0.5.2")
(defvar yas/snippet-tables (make-hash-table) (defvar yas/snippet-tables (make-hash-table)
"A hash table of snippet tables corresponding to each major-mode.") "A hash table of snippet tables corresponding to each major-mode.")