Skip to content

Commit

Permalink
fix indent (was 3 spaces) of snippets for python-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
pluskid committed Apr 25, 2008
1 parent aee34a6 commit 59b1120
Show file tree
Hide file tree
Showing 10 changed files with 112 additions and 106 deletions.
6 changes: 6 additions & 0 deletions doc/changelog.rst
View file
Expand Up @@ -6,6 +6,12 @@ ChangeLog
:Contact: pluskid@gmail.com
: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
==================

Expand Down
88 changes: 44 additions & 44 deletions snippets/text-mode/python-mode/class
View file
Expand Up @@ -5,50 +5,50 @@
# contributor: Yasser González Fernández <yglez@uh.cu>
# --
class ${1:ClassName}(${2:object}):
"""$3
"""
"""$3
"""

def __init__(self, $4):
"""$5
${4:$
(let* ((indent
(concat "\n" (make-string (current-column) 32)))
(args
(mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
def __init__(self, $4):
"""$5
${4:$
(let* ((indent
(concat "\n" (make-string (current-column) 32)))
(args
(mapconcat
'(lambda (x)
(mapcar
(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x))) x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
indent)))
(if (string= args "")
(make-string 3 34)
(mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
${4:$
(mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "self._" (nth 0 x) " = " (nth 0 x))))
(mapcar
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
'(lambda (x)
(mapcar
(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x))) x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
indent)))
(if (string= args "")
(make-string 3 34)
(mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
${4:$
(mapconcat
'(lambda (x)
(mapcar
'(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x)))
x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
(concat "\n" (make-string (current-column) 32)))
}
$0
(if (not (string= (nth 0 x) ""))
(concat "self._" (nth 0 x) " = " (nth 0 x))))
(mapcar
'(lambda (x)
(mapcar
'(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x)))
x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
(concat "\n" (make-string (current-column) 32)))
}
$0
54 changes: 27 additions & 27 deletions snippets/text-mode/python-mode/def
View file
Expand Up @@ -4,31 +4,31 @@
# contributor: Yasser González Fernández <yglez@uh.cu>
# --
def ${1:name}($2):
"""$3
${2:$
(let* ((indent
(concat "\n" (make-string (current-column) 32)))
(args
(mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
"""$3
${2:$
(let* ((indent
(concat "\n" (make-string (current-column) 32)))
(args
(mapconcat
'(lambda (x)
(mapcar
'(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x)))
x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
indent)))
(if (string= args "")
(make-string 3 34)
(mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
$0
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
'(lambda (x)
(mapcar
'(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x)))
x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
indent)))
(if (string= args "")
(make-string 3 34)
(mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
$0
54 changes: 27 additions & 27 deletions snippets/text-mode/python-mode/defm
View file
Expand Up @@ -3,31 +3,31 @@
# contributor: Yasser Gonz¨¢lez Fern¨¢ndez <yglez@uh.cu>
# --
def ${1:name}(self, $2):
"""$3
${2:$
(let* ((indent
(concat "\n" (make-string (current-column) 32)))
(args
(mapconcat
'(lambda (x)
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
"""$3
${2:$
(let* ((indent
(concat "\n" (make-string (current-column) 32)))
(args
(mapconcat
'(lambda (x)
(mapcar
'(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x)))
x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
indent)))
(if (string= args "")
(make-string 3 34)
(mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
$0
(if (not (string= (nth 0 x) ""))
(concat "- " (char-to-string 96) (nth 0 x)
(char-to-string 96) ":")))
(mapcar
'(lambda (x)
(mapcar
'(lambda (x)
(replace-regexp-in-string "\s*$" ""
(replace-regexp-in-string "^\s*" "" x)))
x))
(mapcar '(lambda (x) (split-string x "="))
(split-string text ",")))
indent)))
(if (string= args "")
(make-string 3 34)
(mapconcat
'identity
(list "" "Arguments:" args (make-string 3 34))
indent)))
}
$0
2 changes: 1 addition & 1 deletion snippets/text-mode/python-mode/propg
View file
Expand Up @@ -2,7 +2,7 @@
#name : _get_foo ... foo=property(...)
# --
def _get_${1:foo}(self):
return self._$1
return self._$1

$1 = property(_get_$1)

Expand Down
4 changes: 2 additions & 2 deletions snippets/text-mode/python-mode/propsg
View file
Expand Up @@ -2,10 +2,10 @@
#name : _get_foo ... _set_foo ... foo=property(...)
# --
def _set_${1:foo}(self, value):
self._$1 = value
self._$1 = value

def _get_$1(self):
return self._$1
return self._$1

$1 = property(_get_$1, _set_$1)

Expand Down
2 changes: 1 addition & 1 deletion snippets/text-mode/ruby-mode/r
View file
@@ -1,3 +1,3 @@
#name : attr_reader ...
# --
attr_reader :${attr_names}
attr_reader :
2 changes: 1 addition & 1 deletion snippets/text-mode/ruby-mode/rw
View file
@@ -1,3 +1,3 @@
#name : attr_accessor ...
# --
attr_accessor :{attr_names}
attr_accessor :
2 changes: 1 addition & 1 deletion snippets/text-mode/ruby-mode/w
View file
@@ -1,3 +1,3 @@
#name : attr_writer ...
# --
attr_writer :${attr_names}
attr_writer :
4 changes: 2 additions & 2 deletions yasnippet.el
View file
Expand Up @@ -3,7 +3,7 @@
;; Copyright 2008 pluskid
;;
;; Author: pluskid <pluskid@gmail.com>
;; Version: 0.5.1
;; Version: 0.5.2
;; X-URL: http://code.google.com/p/yasnippet/

;; This file is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -178,7 +178,7 @@ to expand.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Internal variables
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar yas/version "0.5.1")
(defvar yas/version "0.5.2")

(defvar yas/snippet-tables (make-hash-table)
"A hash table of snippet tables corresponding to each major-mode.")
Expand Down

0 comments on commit 59b1120

Please sign in to comment.