From f1e2719ecc58f129ab9ede715586c8b2968ad296 Mon Sep 17 00:00:00 2001
From: James Edward Gray II <james@grayproductions.net>
Date: Mon, 10 Sep 2007 14:22:02 +0000
Subject: [PATCH] Merging the two do .. end snippets into one superior version.

git-svn-id: http://svn.textmate.org/trunk/Bundles/Ruby.tmbundle@8133 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
---
 Snippets/do .. end.plist             | 20 --------------------
 Snippets/do |obj| .. end (doo).plist |  6 +++---
 info.plist                           |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 Snippets/do .. end.plist

diff --git a/Snippets/do .. end.plist b/Snippets/do .. end.plist
deleted file mode 100644
index 6a8d41b..0000000
--- a/Snippets/do .. end.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>do
-	$0
-end</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>do … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>do</string>
-	<key>uuid</key>
-	<string>6670881E-62C3-11D9-B8CF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/Snippets/do |obj| .. end (doo).plist b/Snippets/do |obj| .. end (doo).plist
index 9d20da0..3e41d59 100644
--- a/Snippets/do |obj| .. end (doo).plist	
+++ b/Snippets/do |obj| .. end (doo).plist	
@@ -3,15 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>do |${1:object}|
+	<string>do${1/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1: |)/}${1:variable}${1/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}
 	$0
 end</string>
 	<key>name</key>
-	<string>Insert do |object| … end</string>
+	<string>Insert do |variable| … end</string>
 	<key>scope</key>
 	<string>source.ruby</string>
 	<key>tabTrigger</key>
-	<string>doo</string>
+	<string>do</string>
 	<key>uuid</key>
 	<string>4B72C5C3-6CA7-41AC-B2F9-51DEA25D469E</string>
 </dict>
diff --git a/info.plist b/info.plist
index 4b33ba6..c03c17f 100644
--- a/info.plist
+++ b/info.plist
@@ -19,6 +19,7 @@
 		<string>667081DE-62C3-11D9-B8CF-000D93589AF6</string>
 		<string>66708259-62C3-11D9-B8CF-000D93589AF6</string>
 		<string>66708052-62C3-11D9-B8CF-000D93589AF6</string>
+		<string>6670881E-62C3-11D9-B8CF-000D93589AF6</string>
 	</array>
 	<key>description</key>
 	<string>Support for the &lt;a href="http://www.ruby-lang.org/"&gt;Ruby&lt;/a&gt; programming language.</string>
@@ -432,7 +433,6 @@
 		<string>667083EE-62C3-11D9-B8CF-000D93589AF6</string>
 		<string>48D8E498-C9A5-4B1B-9A18-71A5860276FB</string>
 		<string>4E9A7A73-875C-11D9-897C-000393CBCE2E</string>
-		<string>6670881E-62C3-11D9-B8CF-000D93589AF6</string>
 		<string>6670835F-62C3-11D9-B8CF-000D93589AF6</string>
 		<string>667082E6-62C3-11D9-B8CF-000D93589AF6</string>
 		<string>CD1609FA-47DA-4EE4-9C5B-5C56D953F5B1</string>