Skip to content

Commit

Permalink
Fix #34204 - revert problematic brace matching change from language-php
Browse files Browse the repository at this point in the history
  • Loading branch information
roblourens committed Sep 14, 2017
1 parent 2f25895 commit 27492b6
Showing 1 changed file with 10 additions and 21 deletions.
31 changes: 10 additions & 21 deletions extensions/php/syntaxes/php.tmLanguage.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down

0 comments on commit 27492b6

Please sign in to comment.