@codingame/monaco-editor-wrapper 1.1.5 → 1.4.0

package/dist/php.tmLanguage.js

@@ -3,7 +3,7 @@ var information_for_contributors = [
 	"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 	"Once accepted there, we are happy to receive an update request."
 ];
-var version = "https://github.com/atom/language-php/commit/e3054bdf1f488ae0dcac51a3bc254268e3f26f84";
+var version = "https://github.com/atom/language-php/commit/ff64523c94c014d68f5dec189b05557649c5872a";
 var scopeName = "source.php";
 var patterns = [
 	{
@@ -13,7 +13,7 @@ var patterns = [
 		include: "#comments"
 	},
 	{
-		begin: "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(extends)?\\s*",
+		begin: "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(extends)?\\s*",
 		beginCaptures: {
 			"1": {
 				name: "storage.type.interface.php"
@@ -25,12 +25,12 @@ var patterns = [
 				name: "storage.modifier.extends.php"
 			}
 		},
-		end: "(?i)((?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\s*,\\s*)*)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?\\s*(?:(?={)|$)",
+		end: "(?i)((?:[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\s*,\\s*)*)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?\\s*(?:(?={)|$)",
 		endCaptures: {
 			"1": {
 				patterns: [
 					{
-						match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+						match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 						name: "entity.other.inherited-class.php"
 					},
 					{
@@ -51,7 +51,7 @@ var patterns = [
 		]
 	},
 	{
-		begin: "(?i)^\\s*(trait)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
+		begin: "(?i)^\\s*(trait)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 		beginCaptures: {
 			"1": {
 				name: "storage.type.trait.php"
@@ -69,7 +69,7 @@ var patterns = [
 		]
 	},
 	{
-		match: "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)(?=\\s*;)",
+		match: "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)(?=\\s*;)",
 		name: "meta.namespace.php",
 		captures: {
 			"1": {
@@ -100,7 +100,7 @@ var patterns = [
 				include: "#comments"
 			},
 			{
-				match: "(?i)[a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+",
+				match: "(?i)[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+",
 				name: "entity.name.type.namespace.php",
 				captures: {
 					"0": {
@@ -173,7 +173,7 @@ var patterns = [
 						include: "#scope-resolution"
 					},
 					{
-						match: "(?xi)\n\\b(as)\n\\s+(final|abstract|public|private|protected|static)\n\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
+						match: "(?xi)\n\\b(as)\n\\s+(final|abstract|public|private|protected|static)\n\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 						captures: {
 							"1": {
 								name: "keyword.other.use-as.php"
@@ -187,7 +187,7 @@ var patterns = [
 						}
 					},
 					{
-						match: "(?xi)\n\\b(as)\n\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
+						match: "(?xi)\n\\b(as)\n\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 						captures: {
 							"1": {
 								name: "keyword.other.use-as.php"
@@ -207,7 +207,7 @@ var patterns = [
 						}
 					},
 					{
-						match: "(?i)\\b(insteadof)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
+						match: "(?i)\\b(insteadof)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 						captures: {
 							"1": {
 								name: "keyword.other.use-insteadof.php"
@@ -232,7 +232,7 @@ var patterns = [
 		]
 	},
 	{
-		begin: "(?ix)\n(?:\n  \\b(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*\\b(class)\\b # anonymous class\n)",
+		begin: "(?ix)\n(?:\n  \\b(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*\\b(class)\\b # anonymous class\n)",
 		beginCaptures: {
 			"1": {
 				name: "storage.modifier.${1:/downcase}.php"
@@ -276,11 +276,11 @@ var patterns = [
 					}
 				},
 				contentName: "meta.other.inherited-class.php",
-				end: "(?i)(?=[^a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+				end: "(?i)(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 				patterns: [
 					{
-						begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
-						end: "(?i)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+						begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
+						end: "(?i)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 						endCaptures: {
 							"1": {
 								name: "entity.other.inherited-class.php"
@@ -299,7 +299,7 @@ var patterns = [
 						include: "#namespace"
 					},
 					{
-						match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+						match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 						name: "entity.other.inherited-class.php"
 					}
 				]
@@ -317,13 +317,13 @@ var patterns = [
 						include: "#comments"
 					},
 					{
-						begin: "(?i)(?=[a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)",
+						begin: "(?i)(?=[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)",
 						contentName: "meta.other.inherited-class.php",
-						end: "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\x{7f}-\\x{7fffffff}\\\\\\s]))\\s*)",
+						end: "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\\\s]))\\s*)",
 						patterns: [
 							{
-								begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
-								end: "(?i)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+								begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
+								end: "(?i)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 								endCaptures: {
 									"1": {
 										name: "entity.other.inherited-class.php"
@@ -342,7 +342,7 @@ var patterns = [
 								include: "#namespace"
 							},
 							{
-								match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+								match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 								name: "entity.other.inherited-class.php"
 							}
 						]
@@ -422,7 +422,7 @@ var patterns = [
 		name: "meta.catch.php",
 		patterns: [
 			{
-				match: "(?xi)\n([a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)*) # union or single exception class\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?           # Variable",
+				match: "(?xi)\n([a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)*) # union or single exception class\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?           # Variable",
 				captures: {
 					"1": {
 						patterns: [
@@ -431,8 +431,8 @@ var patterns = [
 								name: "punctuation.separator.delimiter.php"
 							},
 							{
-								begin: "(?i)(?=[\\\\a-z_\\x{7f}-\\x{7fffffff}])",
-								end: "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+								begin: "(?i)(?=[\\\\a-z_\\x{7f}-\\x{10ffff}])",
+								end: "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 								endCaptures: {
 									"1": {
 										name: "support.class.exception.php"
@@ -530,12 +530,12 @@ var patterns = [
 								name: "punctuation.definition.variable.php"
 							}
 						},
-						match: "(?i)((?:(&)\\s*)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(?=,|\\))"
+						match: "(?i)((?:(&)\\s*)?(\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(?=,|\\))"
 					}
 				]
 			},
 			{
-				match: "(?xi)\n(:)\\s*\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)\n(?=\\s*(?:{|/[/*]|\\#|$))",
+				match: "(?xi)\n(:)\\s*\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n)\n(?=\\s*(?:{|/[/*]|\\#|$))",
 				captures: {
 					"1": {
 						name: "keyword.operator.return-value.php"
@@ -590,7 +590,7 @@ var patterns = [
 				]
 			},
 			{
-				match: "(?xi)\n(:)\\s*\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)\n(?=\\s*(?:=>|/[/*]|\\#|$))",
+				match: "(?xi)\n(:)\\s*\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n)\n(?=\\s*(?:=>|/[/*]|\\#|$))",
 				captures: {
 					"1": {
 						name: "keyword.operator.return-value.php"
@@ -628,7 +628,7 @@ var patterns = [
 			}
 		},
 		contentName: "meta.function.parameters.php",
-		end: "(?xi)\n(\\)) \\s* ( : \\s*\n  (?:\\?\\s*)? (?!\\s) [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\\\s\\|&]+ (?<!\\s)\n)?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
+		end: "(?xi)\n(\\)) \\s* ( : \\s*\n  (?:\\?\\s*)? (?!\\s) [a-z0-9_\\x{7f}-\\x{10ffff}\\\\\\s\\|&]+ (?<!\\s)\n)?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
 		endCaptures: {
 			"1": {
 				name: "punctuation.definition.parameters.end.bracket.round.php"
@@ -647,7 +647,7 @@ var patterns = [
 				name: "punctuation.separator.delimiter.php"
 			},
 			{
-				begin: "(?xi)\n((?:(?:public|private|protected|readonly)(?:\\s+|(?=\\?)))++)\n(?: (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n) \\s+ )?\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference",
+				begin: "(?xi)\n((?:(?:public|private|protected|readonly)(?:\\s+|(?=\\?)))++)\n(?: (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n) \\s+ )?\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference",
 				beginCaptures: {
 					"1": {
 						patterns: [
@@ -699,7 +699,7 @@ var patterns = [
 		]
 	},
 	{
-		begin: "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))\n  |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\n)\n\\s*(\\()",
+		begin: "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))\n  |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*))\n)\n\\s*(\\()",
 		beginCaptures: {
 			"1": {
 				patterns: [
@@ -726,7 +726,7 @@ var patterns = [
 			}
 		},
 		contentName: "meta.function.parameters.php",
-		end: "(?xi)\n(\\)) (?: \\s* (:) \\s* (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n) )?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
+		end: "(?xi)\n(\\)) (?: \\s* (:) \\s* (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n) )?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
 		endCaptures: {
 			"1": {
 				name: "punctuation.definition.parameters.end.bracket.round.php"
@@ -741,8 +741,8 @@ var patterns = [
 						name: "storage.type.php"
 					},
 					{
-						match: "\\b(noreturn)\\b",
-						name: "keyword.other.type.noreturn.php"
+						match: "\\b(never)\\b",
+						name: "keyword.other.type.never.php"
 					},
 					{
 						include: "#php-types"
@@ -758,7 +758,7 @@ var patterns = [
 		]
 	},
 	{
-		match: "(?xi)\n((?:(?:public|private|protected|static|readonly)(?:\\s+|(?=\\?)))++)                     # At least one modifier\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)?\n\\s+ ((\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)          # Variable name",
+		match: "(?xi)\n((?:(?:public|private|protected|static|readonly)(?:\\s+|(?=\\?)))++)                     # At least one modifier\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n)?\n\\s+ ((\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)          # Variable name",
 		captures: {
 			"1": {
 				patterns: [
@@ -944,7 +944,7 @@ var patterns = [
 				name: "keyword.operator.type.php"
 			}
 		},
-		end: "(?i)(?=[^\\\\$a-z0-9_\\x{7f}-\\x{7fffffff}])",
+		end: "(?i)(?=[^\\\\$a-z0-9_\\x{7f}-\\x{10ffff}])",
 		patterns: [
 			{
 				include: "#class-name"
@@ -966,7 +966,7 @@ var patterns = [
 				name: "support.other.php"
 			}
 		},
-		match: "(?i)(goto)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)"
+		match: "(?i)(goto)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
 	},
 	{
 		captures: {
@@ -974,7 +974,7 @@ var patterns = [
 				name: "entity.name.goto-label.php"
 			}
 		},
-		match: "(?i)^\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*:(?!:)"
+		match: "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*:(?!:)"
 	},
 	{
 		include: "#string-backtick"
@@ -1057,8 +1057,8 @@ var repository = {
 	"attribute-name": {
 		patterns: [
 			{
-				begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
-				end: "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+				begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
+				end: "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 				endCaptures: {
 					"1": {
 						name: "support.attribute.php"
@@ -1080,8 +1080,8 @@ var repository = {
 				}
 			},
 			{
-				begin: "(?i)(?=[\\\\a-z_\\x{7f}-\\x{7fffffff}])",
-				end: "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+				begin: "(?i)(?=[\\\\a-z_\\x{7f}-\\x{10ffff}])",
+				end: "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 				endCaptures: {
 					"1": {
 						name: "support.attribute.php"
@@ -1105,7 +1105,7 @@ var repository = {
 				name: "punctuation.separator.delimiter.php"
 			},
 			{
-				begin: "([a-zA-Z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)\\s*(\\()",
+				begin: "([a-zA-Z0-9_\\x{7f}-\\x{10ffff}\\\\]+)\\s*(\\()",
 				beginCaptures: {
 					"1": {
 						patterns: [
@@ -1154,8 +1154,8 @@ var repository = {
 	"class-name": {
 		patterns: [
 			{
-				begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
-				end: "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+				begin: "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
+				end: "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 				endCaptures: {
 					"1": {
 						name: "support.class.php"
@@ -1171,8 +1171,8 @@ var repository = {
 				include: "#class-builtin"
 			},
 			{
-				begin: "(?i)(?=[\\\\a-z_\\x{7f}-\\x{7fffffff}])",
-				end: "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+				begin: "(?i)(?=[\\\\a-z_\\x{7f}-\\x{10ffff}])",
+				end: "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 				endCaptures: {
 					"1": {
 						name: "support.class.php"
@@ -1305,7 +1305,7 @@ var repository = {
 				}
 			},
 			{
-				match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+				match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 				name: "constant.other.php"
 			}
 		]
@@ -1323,7 +1323,7 @@ var repository = {
 				name: "punctuation.separator.delimiter.php"
 			},
 			{
-				match: "(?xi)\n(?: (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n) \\s+ )?\n((?:(&)\\s*)?(\\.\\.\\.)(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
+				match: "(?xi)\n(?: (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n) \\s+ )?\n((?:(&)\\s*)?(\\.\\.\\.)(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
 				captures: {
 					"1": {
 						patterns: [
@@ -1348,7 +1348,7 @@ var repository = {
 				name: "meta.function.parameter.variadic.php"
 			},
 			{
-				begin: "(?xi)\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)\n\\s+ ((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference",
+				begin: "(?xi)\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*[|&]\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ # union type\n)\n\\s+ ((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference",
 				beginCaptures: {
 					"1": {
 						patterns: [
@@ -1387,7 +1387,7 @@ var repository = {
 				]
 			},
 			{
-				match: "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
+				match: "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
 				captures: {
 					"1": {
 						name: "variable.other.php"
@@ -1402,7 +1402,7 @@ var repository = {
 				name: "meta.function.parameter.no-default.php"
 			},
 			{
-				begin: "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n\\s*(=)\\s*",
+				begin: "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference\n\\s*(=)\\s*",
 				beginCaptures: {
 					"1": {
 						name: "variable.other.php"
@@ -1428,7 +1428,7 @@ var repository = {
 		]
 	},
 	"named-arguments": {
-		match: "(?i)(?<=^|\\(|,)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(:)(?!:)",
+		match: "(?i)(?<=^|\\(|,)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(:)(?!:)",
 		captures: {
 			"1": {
 				name: "entity.name.variable.parameter.php"
@@ -1441,7 +1441,7 @@ var repository = {
 	"function-call": {
 		patterns: [
 			{
-				begin: "(?x)\n(\n  \\\\?(?<![a-zA-Z0-9_\\x{7f}-\\x{7fffffff}])                            # Optional root namespace\n  [a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*          # First namespace\n  (?:\\\\[a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)+ # Additional namespaces\n)\\s*(\\()",
+				begin: "(?x)\n(\n  \\\\?(?<![a-zA-Z0-9_\\x{7f}-\\x{10ffff}])                            # Optional root namespace\n  [a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*          # First namespace\n  (?:\\\\[a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*)+ # Additional namespaces\n)\\s*(\\()",
 				beginCaptures: {
 					"1": {
 						patterns: [
@@ -1449,7 +1449,7 @@ var repository = {
 								include: "#namespace"
 							},
 							{
-								match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+								match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 								name: "entity.name.function.php"
 							}
 						]
@@ -1475,7 +1475,7 @@ var repository = {
 				]
 			},
 			{
-				begin: "(\\\\)?(?<![a-zA-Z0-9_\\x{7f}-\\x{7fffffff}])([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(\\()",
+				begin: "(\\\\)?(?<![a-zA-Z0-9_\\x{7f}-\\x{10ffff}])([a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
 				beginCaptures: {
 					"1": {
 						patterns: [
@@ -1490,7 +1490,7 @@ var repository = {
 								include: "#support"
 							},
 							{
-								match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+								match: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 								name: "entity.name.function.php"
 							}
 						]
@@ -1524,7 +1524,7 @@ var repository = {
 	heredoc: {
 		patterns: [
 			{
-				begin: "(?i)(?=<<<\\s*(\"?)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)(\\1)\\s*$)",
+				begin: "(?i)(?=<<<\\s*(\"?)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(\\1)\\s*$)",
 				end: "(?!\\G)",
 				name: "string.unquoted.heredoc.php",
 				patterns: [
@@ -1564,7 +1564,7 @@ var repository = {
 					}
 				},
 				contentName: "text.html",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1600,7 +1600,7 @@ var repository = {
 					}
 				},
 				contentName: "text.xml",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1636,7 +1636,7 @@ var repository = {
 					}
 				},
 				contentName: "source.sql",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1672,7 +1672,7 @@ var repository = {
 					}
 				},
 				contentName: "source.js",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1708,7 +1708,7 @@ var repository = {
 					}
 				},
 				contentName: "source.json",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1744,7 +1744,7 @@ var repository = {
 					}
 				},
 				contentName: "source.css",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1780,7 +1780,7 @@ var repository = {
 					}
 				},
 				contentName: "string.regexp.heredoc.php",
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1830,7 +1830,7 @@ var repository = {
 						name: "keyword.operator.regexp.php"
 					},
 					{
-						begin: "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{7fffffff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
+						begin: "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{10ffff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
 						beginCaptures: {
 							"1": {
 								name: "punctuation.definition.comment.php"
@@ -1847,8 +1847,11 @@ var repository = {
 				]
 			},
 			{
-				begin: "(?i)(<<<)\\s*(\"?)([a-z_\\x{7f}-\\x{7fffffff}]+[a-z0-9_\\x{7f}-\\x{7fffffff}]*)(\\2)(\\s*)",
+				begin: "(<<<)\\s*(\"?)(BLADE)(\\2)(\\s*)$",
 				beginCaptures: {
+					"0": {
+						name: "punctuation.section.embedded.begin.php"
+					},
 					"1": {
 						name: "punctuation.definition.string.php"
 					},
@@ -1859,7 +1862,37 @@ var repository = {
 						name: "invalid.illegal.trailing-whitespace.php"
 					}
 				},
-				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				contentName: "text.html.php.blade",
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+				endCaptures: {
+					"0": {
+						name: "punctuation.section.embedded.end.php"
+					},
+					"1": {
+						name: "keyword.operator.heredoc.php"
+					}
+				},
+				name: "meta.embedded.php.blade",
+				patterns: [
+					{
+						include: "#interpolation"
+					}
+				]
+			},
+			{
+				begin: "(?i)(<<<)\\s*(\"?)([a-z_\\x{7f}-\\x{10ffff}]+[a-z0-9_\\x{7f}-\\x{10ffff}]*)(\\2)(\\s*)",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.string.php"
+					},
+					"3": {
+						name: "keyword.operator.heredoc.php"
+					},
+					"5": {
+						name: "invalid.illegal.trailing-whitespace.php"
+					}
+				},
+				end: "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"1": {
 						name: "keyword.operator.heredoc.php"
@@ -1892,7 +1925,7 @@ var repository = {
 					}
 				},
 				contentName: "text.html",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1925,7 +1958,7 @@ var repository = {
 					}
 				},
 				contentName: "text.xml",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1958,7 +1991,7 @@ var repository = {
 					}
 				},
 				contentName: "source.sql",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -1991,7 +2024,7 @@ var repository = {
 					}
 				},
 				contentName: "source.js",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -2024,7 +2057,7 @@ var repository = {
 					}
 				},
 				contentName: "source.json",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -2057,7 +2090,7 @@ var repository = {
 					}
 				},
 				contentName: "source.css",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -2090,7 +2123,7 @@ var repository = {
 					}
 				},
 				contentName: "string.regexp.nowdoc.php",
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"0": {
 						name: "punctuation.section.embedded.end.php"
@@ -2137,7 +2170,7 @@ var repository = {
 						name: "keyword.operator.regexp.php"
 					},
 					{
-						begin: "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{7fffffff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
+						begin: "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{10ffff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
 						beginCaptures: {
 							"1": {
 								name: "punctuation.definition.comment.php"
@@ -2154,8 +2187,11 @@ var repository = {
 				]
 			},
 			{
-				begin: "(?i)(<<<)\\s*'([a-z_\\x{7f}-\\x{7fffffff}]+[a-z0-9_\\x{7f}-\\x{7fffffff}]*)'(\\s*)",
+				begin: "(<<<)\\s*'(BLADE)'(\\s*)$",
 				beginCaptures: {
+					"0": {
+						name: "punctuation.section.embedded.begin.php"
+					},
 					"1": {
 						name: "punctuation.definition.string.php"
 					},
@@ -2166,7 +2202,32 @@ var repository = {
 						name: "invalid.illegal.trailing-whitespace.php"
 					}
 				},
-				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{7fffffff}])",
+				contentName: "text.html.php.blade",
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+				endCaptures: {
+					"0": {
+						name: "punctuation.section.embedded.end.php"
+					},
+					"1": {
+						name: "keyword.operator.nowdoc.php"
+					}
+				},
+				name: "meta.embedded.php.blade"
+			},
+			{
+				begin: "(?i)(<<<)\\s*'([a-z_\\x{7f}-\\x{10ffff}]+[a-z0-9_\\x{7f}-\\x{10ffff}]*)'(\\s*)",
+				beginCaptures: {
+					"1": {
+						name: "punctuation.definition.string.php"
+					},
+					"2": {
+						name: "keyword.operator.nowdoc.php"
+					},
+					"3": {
+						name: "invalid.illegal.trailing-whitespace.php"
+					}
+				},
+				end: "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
 				endCaptures: {
 					"1": {
 						name: "keyword.operator.nowdoc.php"
@@ -2182,10 +2243,10 @@ var repository = {
 				name: "keyword.other.new.php"
 			}
 		},
-		end: "(?i)(?=[^a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+		end: "(?i)(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
 		patterns: [
 			{
-				match: "(?i)(parent|static|self)(?![a-z0-9_\\x{7f}-\\x{7fffffff}])",
+				match: "(?i)(parent|static|self)(?![a-z0-9_\\x{7f}-\\x{10ffff}])",
 				name: "storage.type.php"
 			},
 			{
@@ -2258,11 +2319,11 @@ var repository = {
 				name: "punctuation.definition.variable.php"
 			}
 		},
-		match: "(?i)((\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)(?=\\s*\\()",
+		match: "(?i)((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(?=\\s*\\()",
 		name: "meta.function-call.invoke.php"
 	},
 	namespace: {
-		begin: "(?i)(?:(namespace)|[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?(\\\\)",
+		begin: "(?i)(?:(namespace)|[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(\\\\)",
 		beginCaptures: {
 			"1": {
 				name: "variable.language.namespace.php"
@@ -2271,7 +2332,7 @@ var repository = {
 				name: "punctuation.separator.inheritance.php"
 			}
 		},
-		end: "(?i)(?![a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
+		end: "(?i)(?![a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
 		name: "support.other.namespace.php",
 		patterns: [
 			{
@@ -2341,7 +2402,7 @@ var repository = {
 				]
 			},
 			{
-				begin: "(?i)(\\??->)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(\\()",
+				begin: "(?i)(\\??->)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.class.php"
@@ -2381,7 +2442,7 @@ var repository = {
 						name: "punctuation.definition.variable.php"
 					}
 				},
-				match: "(?i)(\\??->)\\s*((\\$+)?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?"
+				match: "(?i)(\\??->)\\s*((\\$+)?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?"
 			}
 		]
 	},
@@ -2480,8 +2541,8 @@ var repository = {
 				include: "#instantiation"
 			},
 			{
-				begin: "(?xi)\n(?=[a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+\n  (::)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?\n)",
-				end: "(?i)(::)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?",
+				begin: "(?xi)\n(?=[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+\n  (::)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?\n)",
+				end: "(?i)(::)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?",
 				endCaptures: {
 					"1": {
 						name: "keyword.operator.class.php"
@@ -2533,7 +2594,7 @@ var repository = {
 				match: "(@xlink)\\s+(.+)\\s*$"
 			},
 			{
-				begin: "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[A-Za-z_\\x{7f}-\\x{7fffffff}\\\\]|\\()",
+				begin: "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[?A-Za-z_\\x{7f}-\\x{10ffff}\\\\]|\\()",
 				beginCaptures: {
 					"1": {
 						name: "keyword.other.phpdoc.php"
@@ -2569,10 +2630,14 @@ var repository = {
 		]
 	},
 	php_doc_types: {
-		match: "(?i)[a-z_\\x{7f}-\\x{7fffffff}\\\\][a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*([|&][a-z_\\x{7f}-\\x{7fffffff}\\\\][a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)*",
+		match: "(?i)\\??[a-z_\\x{7f}-\\x{10ffff}\\\\][a-z0-9_\\x{7f}-\\x{10ffff}\\\\]*([|&]\\??[a-z_\\x{7f}-\\x{10ffff}\\\\][a-z0-9_\\x{7f}-\\x{10ffff}\\\\]*)*",
 		captures: {
 			"0": {
 				patterns: [
+					{
+						match: "\\?",
+						name: "keyword.operator.nullable-type.php"
+					},
 					{
 						match: "(?x)\\b\n(string|integer|int|boolean|bool|float|double|object|mixed\n|array|resource|void|null|callback|false|true|self|static)\\b",
 						name: "keyword.other.type.php"
@@ -2621,7 +2686,7 @@ var repository = {
 		]
 	},
 	php_doc_types_array_single: {
-		match: "(?i)([a-z_\\x{7f}-\\x{7fffffff}\\\\][a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)(\\[\\])",
+		match: "(?i)([a-z_\\x{7f}-\\x{10ffff}\\\\][a-z0-9_\\x{7f}-\\x{10ffff}\\\\]*)(\\[\\])",
 		captures: {
 			"1": {
 				patterns: [
@@ -2739,7 +2804,7 @@ var repository = {
 	"scope-resolution": {
 		patterns: [
 			{
-				match: "([A-Za-z_\\x{7f}-\\x{7fffffff}\\\\][A-Za-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)(?=\\s*::)",
+				match: "([A-Za-z_\\x{7f}-\\x{10ffff}\\\\][A-Za-z0-9_\\x{7f}-\\x{10ffff}\\\\]*)(?=\\s*::)",
 				captures: {
 					"1": {
 						patterns: [
@@ -2758,7 +2823,7 @@ var repository = {
 				}
 			},
 			{
-				begin: "(?i)(::)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(\\()",
+				begin: "(?i)(::)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
 				beginCaptures: {
 					"1": {
 						name: "keyword.operator.class.php"
@@ -2798,7 +2863,7 @@ var repository = {
 				}
 			},
 			{
-				match: "(?xi)\n(::)\\s*\n(?:\n  ((\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable\n  |\n  ([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)       # Constant\n)?",
+				match: "(?xi)\n(::)\\s*\n(?:\n  ((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable\n  |\n  ([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)       # Constant\n)?",
 				captures: {
 					"1": {
 						name: "keyword.operator.class.php"
@@ -3590,7 +3655,7 @@ var repository = {
 						name: "keyword.other.use-as.php"
 					}
 				},
-				end: "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+				end: "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 				endCaptures: {
 					"0": {
 						name: "entity.other.alias.php"
@@ -3609,7 +3674,7 @@ var repository = {
 	var_basic: {
 		patterns: [
 			{
-				match: "(?i)(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+				match: "(?i)(\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
 				name: "variable.other.php",
 				captures: {
 					"1": {
@@ -3687,7 +3752,7 @@ var repository = {
 						name: "punctuation.section.array.end.php"
 					}
 				},
-				match: "(?xi)\n((\\$)(?<name>[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))\\s*\n(?:\n  (\\??->)\\s*(\\g<name>)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))(\\])\n)?"
+				match: "(?xi)\n((\\$)(?<name>[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*))\\s*\n(?:\n  (\\??->)\\s*(\\g<name>)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*))(\\])\n)?"
 			},
 			{
 				captures: {
@@ -3701,7 +3766,7 @@ var repository = {
 						name: "punctuation.definition.variable.php"
 					}
 				},
-				match: "(?i)((\\${)(?<name>[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)(}))"
+				match: "(?i)((\\${)(?<name>[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(}))"
 			}
 		]
 	},
@@ -3759,7 +3824,7 @@ var repository = {
 		},
 		patterns: [
 			{
-				match: "(?i)^\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(?=:(?!:))",
+				match: "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(?=:(?!:))",
 				captures: {
 					"1": {
 						patterns: [