config/syntax/HTML.json in ver-2009.10.14 vs config/syntax/HTML.json in ver-2009.11.28

- old
+ new

@@ -10,26 +10,26 @@ "tmpl", "tpl", "ctp" ], "firstLineMatch": "<!DOCTYPE|<(?i:html)|<\\?(?i:php)", - "foldingStartMarker": "(?x)\n\t\t(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\\b.*?>\n\t\t|<!--(?!.*--\\s*>)\n\t\t|^<!--\\ \\#tminclude\\ (?>.*?-->)$\n\t\t|<\\?(?:php)?.*\\b(if|for(each)?|while)\\b.+:\n\t\t|\\{\\{?(if|foreach|capture|literal|foreach|php|section|strip)\n\t\t|\\{\\s*($|\\?>\\s*$|\/\/|\/\\*(.*\\*\/\\s*$|(?!.*?\\*\/)))\n\t\t)", - "foldingStopMarker": "(?x)\n\t\t(<\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>\n\t\t|^(?!.*?<!--).*?--\\s*>\n\t\t|^<!--\\ end\\ tminclude\\ -->$\n\t\t|<\\?(?:php)?.*\\bend(if|for(each)?|while)\\b\n\t\t|\\{\\{?\/(if|foreach|capture|literal|foreach|php|section|strip)\n\t\t|^[^{]*\\}\n\t\t)", + "foldingStartMarker": "(?x)\n\t\t(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\\b.*?>\n\t\t|<!--(?!.*--\\s*>)\n\t\t|^<!--\\ \\#tminclude\\ (?>.*?-->)$\n\t\t|<\\?(?:php)?.*\\b(if|for(each)?|while)\\b.+:\n\t\t|\\{\\{?(if|foreach|capture|literal|foreach|php|section|strip)\n\t\t|\\{\\s*($|\\?>\\s*$|//|/\\*(.*\\*/\\s*$|(?!.*?\\*/)))\n\t\t)", + "foldingStopMarker": "(?x)\n\t\t(</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>\n\t\t|^(?!.*?<!--).*?--\\s*>\n\t\t|^<!--\\ end\\ tminclude\\ -->$\n\t\t|<\\?(?:php)?.*\\bend(if|for(each)?|while)\\b\n\t\t|\\{\\{?/(if|foreach|capture|literal|foreach|php|section|strip)\n\t\t|^[^{]*\\}\n\t\t)", "keyEquivalent": "^~H", "name": "HTML", "patterns": [ { - "begin": "(<)([a-zA-Z0-9:]++)(?=[^>]*><\/\\2>)", + "begin": "(<)([a-zA-Z0-9:]++)(?=[^>]*></\\2>)", "beginCaptures": { "1": { "name": "punctuation.definition.tag.html" }, "2": { "name": "entity.name.tag.html" } }, - "end": "(>(<)\/)(\\2)(>)", + "end": "(>(<)/)(\\2)(>)", "endCaptures": { "1": { "name": "punctuation.definition.tag.html" }, "2": { @@ -131,11 +131,11 @@ }, { "include": "#embedded-code" }, { - "begin": "(?:^\\s+)?(<)((?i:style))\\b(?![^>]*\/>)", + "begin": "(?:^\\s+)?(<)((?i:style))\\b(?![^>]*/>)", "captures": { "1": { "name": "punctuation.definition.tag.html" }, "2": { @@ -143,11 +143,11 @@ }, "3": { "name": "punctuation.definition.tag.html" } }, - "end": "(<\/)((?i:style))(>)(?:\\s*\\n)?", + "end": "(</)((?i:style))(>)(?:\\s*\\n)?", "name": "source.css.embedded.html", "patterns": [ { "include": "#tag-stuff" }, @@ -156,11 +156,11 @@ "beginCaptures": { "1": { "name": "punctuation.definition.tag.html" } }, - "end": "(?=<\/(?i:style))", + "end": "(?=</(?i:style))", "patterns": [ { "include": "#embedded-code" }, { @@ -169,20 +169,20 @@ ] } ] }, { - "begin": "(?:^\\s+)?(<)((?i:script))\\b(?![^>]*\/>)", + "begin": "(?:^\\s+)?(<)((?i:script))\\b(?![^>]*/>)", "beginCaptures": { "1": { "name": "punctuation.definition.tag.html" }, "2": { "name": "entity.name.tag.script.html" } }, - "end": "(?<=<\/(script|SCRIPT))(>)(?:\\s*\\n)?", + "end": "(?<=</(script|SCRIPT))(>)(?:\\s*\\n)?", "endCaptures": { "2": { "name": "punctuation.definition.tag.html" } }, @@ -190,38 +190,38 @@ "patterns": [ { "include": "#tag-stuff" }, { - "begin": "(?<!<\/(?:script|SCRIPT))(>)", + "begin": "(?<!</(?:script|SCRIPT))(>)", "captures": { "1": { "name": "punctuation.definition.tag.html" }, "2": { "name": "entity.name.tag.script.html" } }, - "end": "(<\/)((?i:script))", + "end": "(</)((?i:script))", "patterns": [ { "captures": { "1": { "name": "punctuation.definition.comment.js" } }, - "match": "(\/\/).*?((?=<\/script)|$\\n?)", + "match": "(//).*?((?=</script)|$\\n?)", "name": "comment.line.double-slash.js" }, { - "begin": "\/\\*", + "begin": "/\\*", "captures": { "0": { "name": "punctuation.definition.comment.js" } }, - "end": "\\*\/|(?=<\/script)", + "end": "\\*/|(?=</script)", "name": "comment.block.js" }, { "include": "#php" }, @@ -231,11 +231,11 @@ ] } ] }, { - "begin": "(<\/?)((?i:body|head|html)\\b)", + "begin": "(</?)((?i:body|head|html)\\b)", "captures": { "1": { "name": "punctuation.definition.tag.html" }, "2": { @@ -249,11 +249,11 @@ "include": "#tag-stuff" } ] }, { - "begin": "(<\/?)((?i:address|blockquote|dd|div|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\\b)", + "begin": "(</?)((?i:address|blockquote|dd|div|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\\b)", "beginCaptures": { "1": { "name": "punctuation.definition.tag.begin.html" }, "2": { @@ -272,20 +272,20 @@ "include": "#tag-stuff" } ] }, { - "begin": "(<\/?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)", + "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)", "beginCaptures": { "1": { "name": "punctuation.definition.tag.begin.html" }, "2": { "name": "entity.name.tag.inline.any.html" } }, - "end": "((?: ?\/)?>)", + "end": "((?: ?/)?>)", "endCaptures": { "1": { "name": "punctuation.definition.tag.end.html" } }, @@ -295,11 +295,11 @@ "include": "#tag-stuff" } ] }, { - "begin": "(<\/?)([a-zA-Z0-9:]+)", + "begin": "(</?)([a-zA-Z0-9:]+)", "beginCaptures": { "1": { "name": "punctuation.definition.tag.begin.html" }, "2": { @@ -459,10 +459,10 @@ }, "2": { "name": "support.function.built-in.smarty" } }, - "end": "(\\{\/(literal)\\})" + "end": "(\\{/(literal)\\})" }, { "begin": "{{|{", "disabled": 1, "end": "}}|}", \ No newline at end of file