Change while/until and if/unless block rules so it could match inside different parenthesis and after the comma. Add additional capture group in the modifiers rules, because i didn't find another way to assign multiple scope names inside one rule. Fix test file.

Author: graceful-potato

Syntaxes/Ruby.plist

@@ -569,7 +569,7 @@
 			<key>contentName</key>
 			<string>string.regexp.classic.ruby</string>
 			<key>end</key>
-			<string>((/[eimnosux]*))\s*(?:(\b(?:if|unless)\b(?![?!]))|(\b(?:while|until)\b(?![?!])))?</string>
+			<string>((/[eimnosux]*))\s*(?:((\b(?:if|unless)\b(?![?!])))|((\b(?:while|until)\b(?![?!]))))?</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
@@ -585,12 +585,22 @@
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>meta.control.modifier keyword.control.if-unless.ruby</string>
+					<string>meta.control.modifier</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>meta.control.modifier keyword.control.while-until.ruby</string>
+					<string>keyword.control.if-unless.ruby</string>
+				</dict>
+				<key>5</key>
+				<dict>
+					<key>name</key>
+					<string>meta.control.modifier</string>
+				</dict>
+				<key>6</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.control.while-until.ruby</string>
 				</dict>
 			</dict>
 			<key>patterns</key>
@@ -607,7 +617,12 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>meta.control.modifier keyword.control.if-unless.ruby</string>
+					<string>meta.control.modifier</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.control.if-unless.ruby</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -627,14 +642,14 @@
 										 \Win|^in|
 										 \W!|^!|
 										 \W\?|^\?)
-							\s*\b(if|unless)\b(?![?!])
+							\s*\b((if|unless))\b(?![?!])
 			</string>
 		</dict>
 		<dict>
 			<key>begin</key>
 			<string>(?x)
 							(?&lt;!::)
-							(?&lt;=&lt;|&amp;|\||=|&gt;|~|\^|[+\-*/%]|\.{2}|\.{3}|^|;|:|
+							(?&lt;=&lt;|&amp;|\||=|&gt;|~|\^|[+\-*/%]|\.{2}|\.{3}|^|;|:|\[|\(|\{|,|
 										 \Wif|^if|														# \WX|^X is equivalent to \bX
 										 \Wunless|^unless|										# this is workaround for code editors which doesn't support onigomo
 										 \Wcase|^case|												# https://github.com/microsoft/vscode-textmate/issues/121#issuecomment-565689295
@@ -680,6 +695,19 @@
 			</array>
 		</dict>
 		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>meta.control.modifier</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.control.while-until.ruby</string>
+				</dict>
+			</dict>
 			<key>match</key>
 			<string>(?x)
 							(?&lt;=[}\])\w?!"'`])
@@ -697,16 +725,14 @@
 										 \Win|^in|
 										 \W!|^!|
 										 \W\?|^\?)
-							\s*\b(while|until)\b(?![?!])
+							\s*\b((while|until))\b(?![?!])
 			</string>
-			<key>name</key>
-			<string>meta.control.modifier keyword.control.while-until.ruby</string>
 		</dict>
 		<dict>
 			<key>begin</key>
 			<string>(?x)
 							(?&lt;!::)
-							(?&lt;=&lt;|&amp;|\||=|&gt;|~|\^|[+\-*/%]|\.{2}|\.{3}|^|;|:|
+							(?&lt;=&lt;|&amp;|\||=|&gt;|~|\^|[+\-*/%]|\.{2}|\.{3}|^|;|:|\[|\(|\{|,|
 										 \Wif|^if|														# \WX|^X is equivalent to \bX
 										 \Wunless|^unless|										# this is workaround for code editors which doesn't support onigomo
 										 \Wcase|^case|												# https://github.com/microsoft/vscode-textmate/issues/121#issuecomment-565689295

Tests/end_distinction.rb

@@ -4,7 +4,7 @@
 
 # singleline
 class Foo; @@a = 1; end
-class Foo::Bar << M::Baz; @@a = 1; end
+class Foo::Bar < M::Baz; @@a = 1; end
 
 # multiline
 class Foo