branch: master commit 6ce6b24f52f27a3a26492d058a99692354c5421c Author: Joao Tavora <joaotav...@gmail.com> Commit: Joao Tavora <joaotav...@gmail.com>
fix: replace 'text' in 'yas-text' in bundled snippets The previous commit broke these snippets by enabling --- snippets/c++-mode/class | 4 ++-- snippets/c-mode/printf | 4 ++-- snippets/csharp-mode/attrib.2 | 6 +++--- snippets/csharp-mode/method | 2 +- snippets/markdown-mode/h1.2 | 2 +- snippets/markdown-mode/h2.2 | 2 +- snippets/markdown-mode/ol | 2 +- snippets/objc-mode/prop | 2 +- snippets/python-mode/class | 4 ++-- snippets/python-mode/def | 2 +- snippets/python-mode/defm | 2 +- snippets/rst-mode/chap | 2 +- snippets/rst-mode/sec | 2 +- snippets/rst-mode/tit | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/snippets/c++-mode/class b/snippets/c++-mode/class index f33f8b4..4f78ede 100644 --- a/snippets/c++-mode/class +++ b/snippets/c++-mode/class @@ -4,6 +4,6 @@ class ${1:Name} { public: - ${1:$(yas-substr text "[^: ]*")}($2); - virtual ~${1:$(yas-substr text "[^: ]*")}(); + ${1:$(yas-substr yas-text "[^: ]*")}($2); + virtual ~${1:$(yas-substr yas-text "[^: ]*")}(); }; \ No newline at end of file diff --git a/snippets/c-mode/printf b/snippets/c-mode/printf index 36313de..9167555 100644 --- a/snippets/c-mode/printf +++ b/snippets/c-mode/printf @@ -3,5 +3,5 @@ # contributor: joaotavora # key: printf # -- -printf ("${1:%s}\\n"${1:$(if (string-match "%" text) "," "\);") -}$2${1:$(if (string-match "%" text) "\);" "")} \ No newline at end of file +printf ("${1:%s}\\n"${1:$(if (string-match "%" yas-text) "," "\);") +}$2${1:$(if (string-match "%" yas-text) "\);" "")} \ No newline at end of file diff --git a/snippets/csharp-mode/attrib.2 b/snippets/csharp-mode/attrib.2 index 20f1263..e4059b5 100644 --- a/snippets/csharp-mode/attrib.2 +++ b/snippets/csharp-mode/attrib.2 @@ -5,7 +5,7 @@ /// <summary> /// $3 /// </summary> -private $1 ${2:$(if (> (length text) 0) (format "_%s%s" (downcase (substring text 0 1)) (substring text 1 (length text))) "")}; +private $1 ${2:$(if (> (length yas-text) 0) (format "_%s%s" (downcase (substring yas-text 0 1)) (substring yas-text 1 (length yas-text))) "")}; /// <summary> /// ${3:Description} @@ -14,9 +14,9 @@ private $1 ${2:$(if (> (length text) 0) (format "_%s%s" (downcase (substring tex public ${1:Type} ${2:Name} { get { - return this.${2:$(if (> (length text) 0) (format "_%s%s" (downcase (substring text 0 1)) (substring text 1 (length text))) "")}; + return this.${2:$(if (> (length yas-text) 0) (format "_%s%s" (downcase (substring yas-text 0 1)) (substring yas-text 1 (length yas-text))) "")}; } set { - this.${2:$(if (> (length text) 0) (format "_%s%s" (downcase (substring text 0 1)) (substring text 1 (length text))) "")} = value; + this.${2:$(if (> (length yas-text) 0) (format "_%s%s" (downcase (substring yas-text 0 1)) (substring yas-text 1 (length yas-text))) "")} = value; } } \ No newline at end of file diff --git a/snippets/csharp-mode/method b/snippets/csharp-mode/method index e5ea465..c070d48 100644 --- a/snippets/csharp-mode/method +++ b/snippets/csharp-mode/method @@ -4,7 +4,7 @@ # -- /// <summary> /// ${5:Description} -/// </summary>${2:$(if (string= (upcase text) "VOID") "" (format "%s%s%s" "\n/// <returns><c>" text "</c></returns>"))} +/// </summary>${2:$(if (string= (upcase yas-text) "VOID") "" (format "%s%s%s" "\n/// <returns><c>" yas-text "</c></returns>"))} ${1:public} ${2:void} ${3:MethodName}($4) { $0 diff --git a/snippets/markdown-mode/h1.2 b/snippets/markdown-mode/h1.2 index 050963c..6d7a0f2 100644 --- a/snippets/markdown-mode/h1.2 +++ b/snippets/markdown-mode/h1.2 @@ -3,6 +3,6 @@ # key: h1 # -- ${1:Header 1} -${1:$(make-string (string-width text) ?\=)} +${1:$(make-string (string-width yas-text) ?\=)} $0 \ No newline at end of file diff --git a/snippets/markdown-mode/h2.2 b/snippets/markdown-mode/h2.2 index d173bbc..3cfac1f 100644 --- a/snippets/markdown-mode/h2.2 +++ b/snippets/markdown-mode/h2.2 @@ -3,6 +3,6 @@ # key: h2 # -- ${1:Header 2} -${1:$(make-string (string-width text) ?\-)} +${1:$(make-string (string-width yas-text) ?\-)} $0 \ No newline at end of file diff --git a/snippets/markdown-mode/ol b/snippets/markdown-mode/ol index ad1cdd8..e66af9c 100644 --- a/snippets/markdown-mode/ol +++ b/snippets/markdown-mode/ol @@ -3,4 +3,4 @@ # key: ol # -- ${1:1}. ${2:Text} -${1:$(number-to-string (1+ (string-to-number text)))}. $0 \ No newline at end of file +${1:$(number-to-string (1+ (string-to-number yas-text)))}. $0 \ No newline at end of file diff --git a/snippets/objc-mode/prop b/snippets/objc-mode/prop index 1a74edb..bcdf5cb 100644 --- a/snippets/objc-mode/prop +++ b/snippets/objc-mode/prop @@ -6,7 +6,7 @@ return $2; } -- (void)set${2:$(capitalize text)}:($1)aValue +- (void)set${2:$(capitalize yas-text)}:($1)aValue { [$2 autorelease]; $2 = [aValue retain]; diff --git a/snippets/python-mode/class b/snippets/python-mode/class index 69a088e..602d40d 100644 --- a/snippets/python-mode/class +++ b/snippets/python-mode/class @@ -27,7 +27,7 @@ class ${1:ClassName}(${2:object}): (replace-regexp-in-string "[[:blank:]]*$" "" (replace-regexp-in-string "^[[:blank:]]*" "" x))) x)) (mapcar '(lambda (x) (split-string x "=")) - (split-string text ","))) + (split-string yas-text ","))) indent))) (if (string= args "") (make-string 3 34) @@ -49,7 +49,7 @@ class ${1:ClassName}(${2:object}): (replace-regexp-in-string "^[[:blank:]]*" "" x))) x)) (mapcar '(lambda (x) (split-string x "=")) - (split-string text ","))) + (split-string yas-text ","))) (concat "\n" (make-string (current-column) 32))) } $0 \ No newline at end of file diff --git a/snippets/python-mode/def b/snippets/python-mode/def index ebc5c10..5e37469 100644 --- a/snippets/python-mode/def +++ b/snippets/python-mode/def @@ -24,7 +24,7 @@ def ${1:name}($2): (replace-regexp-in-string "^[[:blank:]]*" "" x))) x)) (mapcar '(lambda (x) (split-string x "=")) - (split-string text ","))) + (split-string yas-text ","))) indent))) (if (string= args "") (make-string 3 34) diff --git a/snippets/python-mode/defm b/snippets/python-mode/defm index a2fb5a0..a2459bb 100644 --- a/snippets/python-mode/defm +++ b/snippets/python-mode/defm @@ -22,7 +22,7 @@ def ${1:name}(self, $2): (replace-regexp-in-string "^[[:blank:]]*" "" x))) x)) (mapcar '(lambda (x) (split-string x "=")) - (split-string text ","))) + (split-string yas-text ","))) indent))) (if (string= args "") (make-string 3 34) diff --git a/snippets/rst-mode/chap b/snippets/rst-mode/chap index 593fc0f..26a8e75 100644 --- a/snippets/rst-mode/chap +++ b/snippets/rst-mode/chap @@ -2,6 +2,6 @@ # key: chap # -- ${1:Chapter} -${1:$(make-string (string-width text) ?\=)} +${1:$(make-string (string-width yas-text) ?\=)} $0 \ No newline at end of file diff --git a/snippets/rst-mode/sec b/snippets/rst-mode/sec index c5a60bb..807931e 100644 --- a/snippets/rst-mode/sec +++ b/snippets/rst-mode/sec @@ -2,6 +2,6 @@ # key: sec # -- ${1:Section} -${1:$(make-string (string-width text) ?\-)} +${1:$(make-string (string-width yas-text) ?\-)} $0 \ No newline at end of file diff --git a/snippets/rst-mode/tit b/snippets/rst-mode/tit index 46ac6b1..3a33bac 100644 --- a/snippets/rst-mode/tit +++ b/snippets/rst-mode/tit @@ -1,8 +1,8 @@ # name: Document title # key: tit # -- -${1:$(make-string (string-width text) ?\=)} +${1:$(make-string (string-width yas-text) ?\=)} ${1:Title} -${1:$(make-string (string-width text) ?\=)} +${1:$(make-string (string-width yas-text) ?\=)} $0 \ No newline at end of file