Fixed highlighting for constants

Author: sergeyklay

syntaxes/zephir.tmLanguage.json

@@ -458,6 +458,9 @@
 				}
 			]
 		},
+		{
+			"include": "#constants"
+		},
 		{
 			"include": "#scope-resolution"
 		},
@@ -707,9 +710,6 @@
 				}
 			]
 		},
-		{
-			"include": "#constants"
-		},
 		{
 			"include": "#punctuation-comma"
 		}
@@ -825,8 +825,23 @@
 					"name": "constant.language.zephir"
 				},
 				{
-					"match": "\\b[_A-Z][_A-Z0-9]*\\b",
-					"name": "variable.other.constant.zephir"
+					"match": "(?!\\|\\$|->)(?:::)?\\s*\\b([_A-Z][_A-Z0-9]*)\\b(?=\\s|;|$)",
+					"captures":{
+						"1": {
+							"name": "constant.language.zephir"
+						}
+					}
+				},
+				{
+					"match": "(?!\\|\\$|->)(const)\\s*\\b([_A-Z][_A-Z0-9]*)\\b(?=\\s|;|=|$)",
+					"captures":{
+						"1": {
+							"name": "storage.modifier.zephir"
+						},
+						"2": {
+							"name": "constant.language.zephir"
+						}
+					}
 				}
 			]
 		},