diff --git a/build/demo/kitchen-sink/kitchen-sink-uncompressed.js b/build/demo/kitchen-sink/kitchen-sink-uncompressed.js index 5b255dab..88cf0aa6 100644 --- a/build/demo/kitchen-sink/kitchen-sink-uncompressed.js +++ b/build/demo/kitchen-sink/kitchen-sink-uncompressed.js @@ -11767,7 +11767,16 @@ exports.XmlHighlightRules = XmlHighlightRules; * * ***** END LICENSE BLOCK ***** */ -define('ace/mode/xml_util', ['require', 'exports', 'module' ], function(require, exports, module) { +define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) { + var lang = require("../lib/lang"); + + var formTags = lang.arrayToMap( + ("button|form|input|label|select|textarea").split("|") + ); + + var tableTags = lang.arrayToMap( + ("table|tbody|td|tfoot|th|tr").split("|") + ); function string(state) { return [{ @@ -11807,9 +11816,33 @@ exports.tag = function(states, name, nextState) { token : "text", regex : "\\s+" }, { - token : "meta.tag", + //token : "meta.tag", + + token : function(value) { + if ( value==='a' ) { + return "meta.tag.anchor"; + } + else if ( value==='img' ) { + return "meta.tag.image"; + } + else if ( value==='script' ) { + return "meta.tag.script"; + } + else if ( value==='style' ) { + return "meta.tag.style"; + } + else if (formTags.hasOwnProperty(value.toLowerCase())) { + return "meta.tag.form"; + } + else if (tableTags.hasOwnProperty(value.toLowerCase())) { + return "meta.tag.table"; + } + else { + return "meta.tag"; + } + }, merge : true, - regex : "[-_a-zA-Z0-9:]+", + regex : "[-_a-zA-Z0-9:!]+", next : name + "embed-attribute-list" }, { token: "empty", @@ -16129,6 +16162,7 @@ var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocComme var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var PhpHighlightRules = function() { + var docComment = new DocCommentHighlightRules(); // http://php.net/quickref.php var builtinFunctions = lang.arrayToMap( ('abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|' + @@ -16988,13 +17022,32 @@ var PhpHighlightRules = function() { this.$rules = { "start" : [ { - token : "support", // php open tag + token : "support.php_tag", // php open tag regex : "<\\?(?:php|\\=)" }, { - token : "support", // php close tag + token : "support.php_tag", // php close tag regex : "\\?>" }, + { + token : "comment", + regex : "<\\!--", + next : "htmlcomment" + }, + { + token : "meta.tag", + regex : "\n\n \n
\n