From 27492b6bf3acb0775d82d2f87b25a93490673c6d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 13 Sep 2017 14:56:18 -0700
Subject: [PATCH] Fix #34204 - revert problematic brace matching change from
 language-php

---
 extensions/php/syntaxes/php.tmLanguage.json | 31 +++++++--------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index 8d571c01747e1..3f4d3f537f675 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-php/blob/master/grammars/php.cson",
+		"This file has been converted from https://github.com/roblourens/language-php/blob/revertBraceMatching/grammars/php.cson",
 		"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."
 	],
-	"version": "https://github.com/atom/language-php/commit/f53f2fc2c3f52468b6d205b8c2bbf79aca95f5b2",
+	"version": "https://github.com/roblourens/language-php/commit/91d50ab5f871ea2d11b4c511dc0b9a972e4ac5ce",
 	"scopeName": "text.html.php",
 	"name": "PHP",
 	"fileTypes": [
@@ -1428,6 +1428,14 @@
 				{
 					"include": "#comments"
 				},
+				{
+					"match": "{",
+					"name": "punctuation.section.scope.begin.php"
+				},
+				{
+					"match": "}",
+					"name": "punctuation.section.scope.end.php"
+				},
 				{
 					"begin": "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(extends)?\\s*",
 					"beginCaptures": {
@@ -2086,25 +2094,6 @@
 				{
 					"include": "#string-backtick"
 				},
-				{
-					"begin": "{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.begin.bracket.curly.php"
-						}
-					},
-					"end": "}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.end.bracket.curly.php"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#language"
-						}
-					]
-				},
 				{
 					"begin": "\\[",
 					"beginCaptures": {