Fixed optional do for while loop.

Author: graceful-potato

Syntaxes/Ruby.plist

@@ -317,7 +317,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>\b(for)\b(?![?!])</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\b(for)\b(?![?!])</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -387,7 +387,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;![^.]\.|::)\b(do)\b(?![?!])\s*(\|[^|]*\|)?</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\b(do)\b(?![?!])\s*(\|[^|]*\|)?</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -428,7 +428,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;![^.]\.|::)\b(begin)\b(?![?!])</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\b(begin)\b(?![?!])</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -459,7 +459,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;![^.]\.|::)\b(case)\b(?![?!])</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\b(case)\b(?![?!])</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -695,7 +695,7 @@
 										 \Win|^in|
 										 \W!|^!|
 										 \W\?|^\?)
-							\s*\b(while|until)\b(?![?!])\s*((?:.+?)(?=do)|(?:.+?)(?=;)|(?:.+?)(?=$))(\bdo\b)?
+							\s*\b(while|until)\b(?![?!])
 			</string>
 			<key>beginCaptures</key>
 			<dict>
@@ -704,26 +704,7 @@
 					<key>name</key>
 					<string>keyword.control.while-until.begin.ruby</string>
 				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>source.ruby</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.do.optional.ruby</string>
-				</dict>
 			</dict>
-			<key>comment</key>
-			<string> the optional name is just to catch the def also without a method-name</string>
 			<key>end</key>
 			<string>\bend\b</string>
 			<key>endCaptures</key>
@@ -738,6 +719,27 @@
 			<string>meta.syntax.while-until-block.ruby</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>begin</key>
+					<string>\G</string>
+					<key>end</key>
+					<string>(?&lt;!\.)(\bdo\b)(?![?!])|;|$</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.control.do.optional.ruby</string>
+						</dict>
+					</dict>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>$self</string>
+						</dict>
+					</array>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>$self</string>
@@ -746,13 +748,13 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;![^.]\.|::)\brescue\b(?![?!])</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\brescue\b(?![?!])</string>
 			<key>name</key>
 			<string>keyword.control.rescue.ruby</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;![^.]\.|::)\bensure\b(?![?!])</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\bensure\b(?![?!])</string>
 			<key>name</key>
 			<string>keyword.control.ensure.ruby</string>
 		</dict>

Tests/end_distinction.rb

@@ -127,11 +127,23 @@ def f arg
 1..for i in [1,2,3] do break i if i == 2; end
 1...for i in [1,2,3] do break i if i == 2; end
 10 / for i in [1,2,3] do break i if i == 2; end
-
-
 #you cant use do-end blocks inside in statement
 for i in 3.times.map do 1 end do puts i; end                     # shouldn't work
 for? i in [1,2,3]                                                # shouldn't work
+for! i in [1,2,3]                                                # shouldn't work
+self.for i in [1,2,3]                                            # shouldn't work
+
+# multiline
+for i in [1,2,3]
+  puts i
+end
+
+for i in for j in [[1,2]] do break j; end do
+  r = [i].map do |e|
+    e
+  end
+  p r
+end
 
 # -------------------------------------------
 # Testarea for while/until
@@ -157,6 +169,7 @@ def f arg
 while i < while j < 10 do break j if j == 5; j+=1; end; break i if i > 3; i += 1; end
 while i < while j < 10; break j if j == 5; j+=1; end do break i if i > 3; i += 1; end
 while i < while j < 10 do break j if j == 5; j+=1; end do break i if i > 3; i += 1; end
+while false do [1,2,3].each do |e| puts e end; end
 
 # singleline modifier
 foo::while false                              # shouldn't work