From 59b11202922be38e652e9a6eda32939931b44a1c Mon Sep 17 00:00:00 2001 From: pluskid Date: Fri, 25 Apr 2008 15:01:39 +0000 Subject: [PATCH] fix indent (was 3 spaces) of snippets for python-mode --- doc/changelog.rst | 6 ++ snippets/text-mode/python-mode/class | 88 +++++++++++++-------------- snippets/text-mode/python-mode/def | 54 ++++++++-------- snippets/text-mode/python-mode/defm | 54 ++++++++-------- snippets/text-mode/python-mode/propg | 2 +- snippets/text-mode/python-mode/propsg | 4 +- snippets/text-mode/ruby-mode/r | 2 +- snippets/text-mode/ruby-mode/rw | 2 +- snippets/text-mode/ruby-mode/w | 2 +- yasnippet.el | 4 +- 10 files changed, 112 insertions(+), 106 deletions(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index c6743b6..d6af2e0 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -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 ================== diff --git a/snippets/text-mode/python-mode/class b/snippets/text-mode/python-mode/class index a45923b..de303cc 100644 --- a/snippets/text-mode/python-mode/class +++ b/snippets/text-mode/python-mode/class @@ -5,50 +5,50 @@ # contributor: Yasser González Fernández # -- 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 diff --git a/snippets/text-mode/python-mode/def b/snippets/text-mode/python-mode/def index 0f1542f..d6cc16b 100644 --- a/snippets/text-mode/python-mode/def +++ b/snippets/text-mode/python-mode/def @@ -4,31 +4,31 @@ # contributor: Yasser González Fernández # -- 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 diff --git a/snippets/text-mode/python-mode/defm b/snippets/text-mode/python-mode/defm index 0e53903..24df67c 100644 --- a/snippets/text-mode/python-mode/defm +++ b/snippets/text-mode/python-mode/defm @@ -3,31 +3,31 @@ # contributor: Yasser Gonz¨¢lez Fern¨¢ndez # -- 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 diff --git a/snippets/text-mode/python-mode/propg b/snippets/text-mode/python-mode/propg index e7c4d1e..7e994b6 100644 --- a/snippets/text-mode/python-mode/propg +++ b/snippets/text-mode/python-mode/propg @@ -2,7 +2,7 @@ #name : _get_foo ... foo=property(...) # -- def _get_${1:foo}(self): - return self._$1 + return self._$1 $1 = property(_get_$1) diff --git a/snippets/text-mode/python-mode/propsg b/snippets/text-mode/python-mode/propsg index 0161661..e09d82a 100644 --- a/snippets/text-mode/python-mode/propsg +++ b/snippets/text-mode/python-mode/propsg @@ -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) diff --git a/snippets/text-mode/ruby-mode/r b/snippets/text-mode/ruby-mode/r index 27696d8..b8d68d3 100644 --- a/snippets/text-mode/ruby-mode/r +++ b/snippets/text-mode/ruby-mode/r @@ -1,3 +1,3 @@ #name : attr_reader ... # -- -attr_reader :${attr_names} \ No newline at end of file +attr_reader : \ No newline at end of file diff --git a/snippets/text-mode/ruby-mode/rw b/snippets/text-mode/ruby-mode/rw index a46977f..aadf605 100644 --- a/snippets/text-mode/ruby-mode/rw +++ b/snippets/text-mode/ruby-mode/rw @@ -1,3 +1,3 @@ #name : attr_accessor ... # -- -attr_accessor :{attr_names} \ No newline at end of file +attr_accessor : \ No newline at end of file diff --git a/snippets/text-mode/ruby-mode/w b/snippets/text-mode/ruby-mode/w index fda3faa..d680f25 100644 --- a/snippets/text-mode/ruby-mode/w +++ b/snippets/text-mode/ruby-mode/w @@ -1,3 +1,3 @@ #name : attr_writer ... # -- -attr_writer :${attr_names} \ No newline at end of file +attr_writer : \ No newline at end of file diff --git a/yasnippet.el b/yasnippet.el index 357e49a..d5bf41a 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -3,7 +3,7 @@ ;; Copyright 2008 pluskid ;; ;; Author: pluskid -;; 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 @@ -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.")