Added support of for ..., ... in reverse highlighting

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+- Added support of `for ..., ... in reverse` highlighting
+
 ### Changed
 - Improved constants recognition
 - Improved support of `this` highlighting

syntaxes/zephir.tmLanguage.json

@@ -38,8 +38,7 @@
 							"name": "entity.other.inherited-class.zephir"
 						},
 						{
-							"match": ",",
-							"name": "punctuation.separator.classes.zephir"
+							"include": "#punctuation-comma"
 						}
 					]
 				},
@@ -204,8 +203,7 @@
 							}
 						},
 						{
-							"match": ";",
-							"name": "punctuation.terminator.expression.zephir"
+							"include": "#punctuation-semicolon"
 						},
 						{
 							"include": "#use-inner"
@@ -343,12 +341,10 @@
 			"include": "#switch_statement"
 		},
 		{
-			"match": "\\s*(?<!\\$)\\b(break|case|continue|declare|default|die|let|var|do|else(if)?|exit|for|fetch|reverse|(?:un)?likely|if|return|match|switch|use|while|loop|yield)\\b",
-			"captures": {
-				"1": {
-					"name": "keyword.control.${1:/downcase}.zephir"
-				}
-			}
+			"include": "#for-loop"
+		},
+		{
+			"include": "#control-flow"
 		},
 		{
 			"begin": "(?i)\\b((?:require|include)(?:_once)?)\\s+",
@@ -548,8 +544,7 @@
 			"include": "#object"
 		},
 		{
-			"match": ";",
-			"name": "punctuation.terminator.expression.zephir"
+			"include": "#punctuation-semicolon"
 		},
 		{
 			"match": ":",
@@ -713,8 +708,7 @@
 			"include": "#constants"
 		},
 		{
-			"match": ",",
-			"name": "punctuation.separator.delimiter.zephir"
+			"include": "#punctuation-comma"
 		}
 	],
 	"repository": {
@@ -905,8 +899,7 @@
 					"include": "#comments"
 				},
 				{
-					"match": ",",
-					"name": "punctuation.separator.delimiter.zephir"
+					"include": "#punctuation-comma"
 				},
 				{
 					"begin": "(?i)(array)\\s+((&)?\\s*(\\$+)?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(=)\\s*(array)\\s*(\\()",
@@ -1597,6 +1590,14 @@
 				}
 			]
 		},
+		"punctuation-semicolon": {
+			"name": "punctuation.terminator.statement.zephir",
+			"match": ";"
+		},
+		"punctuation-comma": {
+			"name": "punctuation.separator.comma.zephir",
+			"match": ","
+		},
 		"regex-double-quoted": {
 			"begin": "\"/(?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",
 			"beginCaptures": {
@@ -1777,8 +1778,7 @@
 					"include": "#class-name"
 				},
 				{
-					"match": ",",
-					"name": "punctuation.separator.delimiter.zephir"
+					"include": "#punctuation-comma"
 				}
 			]
 		},
@@ -1936,6 +1936,67 @@
 				}
 			]
 		},
+		"control-flow": {
+			"match": "\\s*(?<!\\$)\\b(break|case|continue|declare|default|die|let|var|do|else(if)?|exit|fetch|(?:un)?likely|if|return|match|switch|use|while|loop|yield)\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.control.${1:/downcase}.zephir"
+				}
+			}
+		},
+		"for-loop": {
+			"name": "meta.loop.zephir",
+			"begin": "(?<!->|\\$)\\b(for)\\b(?:\\s*(\\())?\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.loop.zephir"
+				},
+				"2": {
+					"name": "meta.brace.round.zephir"
+				}
+			},
+			"end": "(?:\\s*(\\)))?\\s*(\\{)",
+			"endCaptures": {
+				"1": {
+					"name": "meta.brace.round.zephir"
+				},
+				"2": {
+					"name": "punctuation.definition.block.zephir"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "(,)\\s*(?!\\S)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.separator.comma.zephir"
+						}
+					},
+					"end": "(?<!,)((?=(\\s+(in)\\s+(reverse\\s+)?)|^\\s*$))|((?<=\\S)(?=\\s*$))",
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#variable-name"
+						}
+					]
+				},
+				{
+					"include": "#function-call"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"match": "\\b(in|reverse)\\b",
+					"name": "keyword.operator.expression.${1:/downcase}.zephir"
+				}
+			]
+		},
 		"null_coalescing": {
 			"match": "\\?\\?",
 			"name": "keyword.operator.null-coalescing.zephir"