From ca2b25e84a12431a6cd0d0378248c61adc9730bb Mon Sep 17 00:00:00 2001
From: Rob Christie <robchristie@gmail.com>
Date: Thu, 22 Oct 2009 14:06:52 +0000
Subject: [PATCH] Updates to imported ruby-mode block snippets.

---
 .../imported/ruby-mode/Blocks/do |obj| .. end (doo).yasnippet | 4 ++--
 .../ruby-mode/Blocks/lambda { |args| .. }  (lam).yasnippet    | 2 +-
 .../imported/ruby-mode/Blocks/open yield block ({).yasnippet  | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extras/imported/ruby-mode/Blocks/do |obj| .. end (doo).yasnippet b/extras/imported/ruby-mode/Blocks/do |obj| .. end (doo).yasnippet
index c53812a..ebecf3b 100644
--- a/extras/imported/ruby-mode/Blocks/do |obj| .. end (doo).yasnippet	
+++ b/extras/imported/ruby-mode/Blocks/do |obj| .. end (doo).yasnippet	
@@ -4,6 +4,6 @@
 # name: Insert do |variable| … end
 ## condition: "source.ruby"
 # --
-do${1/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1: |)/}${1:variable}${1/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:|)/}
-	$0
+do ${1:$(if (string= yas/text "") "" "|")}${1:variable}${1:$(if (string= yas/text "") "" "|")}
+  $0
 end
\ No newline at end of file
diff --git a/extras/imported/ruby-mode/Blocks/lambda { |args| .. }  (lam).yasnippet b/extras/imported/ruby-mode/Blocks/lambda { |args| .. }  (lam).yasnippet
index ea3971c..ee32a73 100644
--- a/extras/imported/ruby-mode/Blocks/lambda { |args| .. }  (lam).yasnippet	
+++ b/extras/imported/ruby-mode/Blocks/lambda { |args| .. }  (lam).yasnippet	
@@ -4,4 +4,4 @@
 # name: lambda { |args| .. }
 ## condition: "source.ruby"
 # --
-lambda { ${1/(^(?<var>\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:|)/}${1:args}${1/(^(?<var>\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:| )/}$0 }
\ No newline at end of file
+lambda { ${1:$(if (string= yas/text "") "" "|")}${1:args}${1:$(if (string= yas/text "") "" "|")}$0 }
\ No newline at end of file
diff --git a/extras/imported/ruby-mode/Blocks/open yield block ({).yasnippet b/extras/imported/ruby-mode/Blocks/open yield block ({).yasnippet
index 63485a7..3d40f34 100644
--- a/extras/imported/ruby-mode/Blocks/open yield block ({).yasnippet	
+++ b/extras/imported/ruby-mode/Blocks/open yield block ({).yasnippet	
@@ -1,7 +1,9 @@
 # -*- mode: snippet -*-
 # key: {
 # contributor: Translated from TextMate Snippet
+# assumes some sort of autopairing of the braces such as autopair.el or ruby electric
+# that would have added the closing brace.
 # name: Insert { |variable| … }
 ## condition: "source.ruby - string - comment"
 # --
-{ ${1/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:|)/}${1:variable}${1/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:| )/}${2:`yas/selected-text`} 
\ No newline at end of file
+{ ${1:$(if (string= yas/text "") "" "|")}${1:variable}${1:$(if (string= yas/text "") "" "|")}${2:`yas/selected-text`} 
\ No newline at end of file