Fixed support of this and globals highlighting

Author: sergeyklay

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.3.1] - 2017-12-24
+### Fixed
+ - Fixed support of `this` and globals highlighting
+
 ## [1.3.0] - 2017-12-24
 ### Added
  - Added support of type hint highlighting for function parameters
@@ -28,7 +32,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Initial stable release
 
-[Unreleased]: https://github.com/zephir-lang/zephir-vscode/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/zephir-lang/zephir-vscode/compare/v1.3.1...HEAD
+[1.3.1]: https://github.com/zephir-lang/zephir-vscode/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/zephir-lang/zephir-vscode/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/zephir-lang/zephir-vscode/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/zephir-lang/zephir-vscode/compare/v1.0.0...v1.1.0

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zephir",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "displayName": "Zephir for VSCode",
     "title": "Zephir for VSCode",
     "description": "Zephir Language support for VSCode",

syntaxes/zephir.tmLanguage.json

@@ -7,7 +7,7 @@
 	],
 	"name": "Zephir",
 	"comment": "Zephir Language support for VSCode",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"fileTypes": [
         "zep"
     ],
@@ -468,6 +468,9 @@
 		{
 			"include": "#scope-resolution"
 		},
+		{
+			"include": "#variables"
+		},
 		{
 			"include": "#strings"
 		},
@@ -1908,12 +1911,25 @@
 				}
 			]
 		},
+		"variables": {
+			"patterns": [
+				{
+					"include": "#var_language"
+				},
+				{
+					"include": "#var_global"
+				},
+				{
+					"include": "#var_global_safer"
+				}
+			]
+		},
 		"var_language": {
-			"match": "this\\b",
-			"name": "variable.language.this.zephir",
+			"match": "\\b(this)\\b",
+			"name": "variable.language.this.php",
 			"captures": {
 				"1": {
-					"name": "punctuation.definition.variable.zephir"
+					"name": "storage.type.zephir"
 				}
 			}
 		},