diff --git a/Makefile.dryice.js b/Makefile.dryice.js index f8e1383c..95397064 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -267,7 +267,7 @@ function workers(path) { }).filter(function(x) { return !!x; }); } function modeList() { - return jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|xml_util|_outdent|behaviour|completions/) + return jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|_outdent|behaviour|completions/) } function addSuffix(options) { @@ -280,7 +280,7 @@ function addSuffix(options) { } } -function getWriteFilters(options, projectType, main) { +function getWriteFilters(options, projectType) { var filters = [ copy.filter.moduleDefines, removeUseStrict, @@ -293,30 +293,29 @@ function getWriteFilters(options, projectType, main) { if (options.noconflict) filters.push(namespace(options.ns)); - - if (options.exportModule && projectType == "main" || projectType == "ext") { - filters.push(exportAce(options.ns, options.exportModule, - options.noconflict ? options.ns : "", projectType == "ext" && main)); - } - + if (options.compress) filters.push(copy.filter.uglifyjs); - - // copy.filter.uglifyjs.options.ascii_only = true; doesn't work with some uglify.js versions + + // copy.filter.uglifyjs.options.ascii = true; doesn't work with some uglify.js versions filters.push(function(text) { - var text = text.replace(/[\x00-\x08\x0b\x0c\x0e\x19\x80-\uffff]/g, function(c) { + var t1 = text.replace(/[\x80-\uffff]/g, function(c) { c = c.charCodeAt(0).toString(16); - if (c.length == 1) - return "\\x0" + c; if (c.length == 2) return "\\x" + c; if (c.length == 3) - return "\\u0" + c; + c = "0" + c; return "\\u" + c; }); - return text; + return text; }); - + + if (options.exportModule && projectType == "main") { + if (options.noconflict) + filters.push(exportAce(options.ns, options.exportModule, options.ns)); + else + filters.push(exportAce(options.ns, options.exportModule)); + } return filters; } @@ -391,7 +390,7 @@ var buildAce = function(options) { project: cloneProject(project), require: [ 'ace/ext/' + ext ] }], - filter: getWriteFilters(options, "ext", 'ace/ext/' + ext), + filter: getWriteFilters(options, "ext"), dest: targetDir + "/ext-" + ext + ".js" }); }); @@ -417,7 +416,7 @@ var buildAce = function(options) { project.assumeAllFilesLoaded(); delete project.ignoredModules["ace/theme/textmate"]; delete project.ignoredModules["ace/requirejs/text!ace/theme/textmate.css"]; - + options.themes.forEach(function(theme) { console.log("theme " + theme); copy({ @@ -429,7 +428,7 @@ var buildAce = function(options) { dest: targetDir + "/theme-" + theme.replace("_theme", "") + ".js" }); }); - + // generateThemesModule(options.themes); console.log('# ace key bindings ---------'); @@ -553,6 +552,15 @@ var detectTextModules = function(input, source) { detectTextModules.onRead = true; copy.filter.addDefines = detectTextModules; +function generateThemesModule(themes) { + var themelist = [ + 'define(function(require, exports, module) {', + '\n\nmodule.exports.themes = ' + JSON.stringify(themes, null, ' '), + ';\n\n});' + ].join(''); + fs.writeFileSync(__dirname + '/lib/ace/ext/themelist_utils/themes.js', themelist, 'utf8'); +} + function inlineTextModules(text) { var deps = []; return text.replace(/, *['"]ace\/requirejs\/text!(.*?)['"]| require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, dep, call) { @@ -568,38 +576,14 @@ function inlineTextModules(text) { }); call = textModules[dep]; + // if (deps.length > 1) + // console.log(call.length) if (call) return " " + call; } }); } -var CommonJsProject = copy.createCommonJsProject({roots:[]}).constructor; -CommonJsProject.prototype.getCurrentModules = function() { - function isDep(child, parent) { - if (!modules[parent]) - return false; - var deps = modules[parent].deps; - if (deps[child]) return true; - return Object.keys(deps).some(function(x) { - return isDep(child, x) - }); - } - var depMap = {}, modules = this.currentModules; - return Object.keys(this.currentModules).map(function(moduleName) { - module = modules[moduleName]; - module.id = moduleName; - module.isSpecial = !/define\(\'[^']*',/.test(module.source); - return module; - }).sort(function(a, b) { - if (a.isSpecial) return -1; - if (b.isSpecial) return 1; - if (isDep(a.id, b.id)) return -1; - if (isDep(b.id, a.id)) return 1; - return Object.keys(a.deps).length - Object.keys(b.deps).length || a.id.localeCompare(b.id) - }); -}; - // TODO: replace with project.clone once it is fixed in dryice function cloneProject(project) { var clone = copy.createCommonJsProject({ @@ -620,12 +604,16 @@ function cloneProject(project) { } function copyFileSync(srcFile, destFile) { - var BUF_LENGTH = 64*1024; - var buf = new Buffer(BUF_LENGTH); - var bytesRead = BUF_LENGTH; - var pos = 0; - var fdr = fs.openSync(srcFile, 'r'); - var fdw = fs.openSync(destFile, 'w'); + var BUF_LENGTH = 64*1024, + buf = new Buffer(BUF_LENGTH), + bytesRead = BUF_LENGTH, + pos = 0, + fdr = null, + fdw = null; + + + fdr = fs.openSync(srcFile, 'r'); + fdw = fs.openSync(destFile, 'w'); while (bytesRead === BUF_LENGTH) { bytesRead = fs.readSync(fdr, buf, 0, BUF_LENGTH, pos); @@ -662,33 +650,23 @@ function namespace(ns) { }; } -function exportAce(ns, module, requireBase, extModule) { +function exportAce(ns, module, requireBase) { requireBase = requireBase || "window"; module = module || "ace/ace"; return function(text) { + var template = function() { (function() { REQUIRE_NS.require(["MODULE"], function(a) { - a && a.config.init(true); + a && a.config.init(); if (!window.NS) - window.NS = a; + window.NS = {}; for (var key in a) if (a.hasOwnProperty(key)) NS[key] = a[key]; }); })(); }; - - if (extModule) { - module = extModule; - template = function() { - (function() { - REQUIRE_NS.require(["MODULE"], function() {}); - })(); - }; - } - - text = text.replace(/function init\(packaged\) {/, "init(true);$&\n"); - + return (text + ";" + template .toString() .replace(/MODULE/g, module) @@ -705,21 +683,12 @@ function updateModes() { var source = fs.readFileSync(filepath, "utf8"); if (!/this.\$id\s*=\s*"/.test(source)) source = source.replace(/\n([ \t]*)(\}\).call\(\w*Mode.prototype\))/, '\n$1 this.$id = "";\n$1$2'); - + source = source.replace(/(this.\$id\s*=\s*)"[^"]*"/, '$1"ace/mode/' + m + '"'); fs.writeFileSync(filepath, source, "utf8") }) } -function generateThemesModule(themes) { - var themelist = [ - 'define(function(require, exports, module) {', - '\n\nmodule.exports.themes = ' + JSON.stringify(themes, null, ' '), - ';\n\n});' - ].join(''); - fs.writeFileSync(__dirname + '/lib/ace/ext/themelist_utils/themes.js', themelist, 'utf8'); -} - if (!module.parent) main(process.argv); else diff --git a/lib/ace/mode/handlebars_highlight_rules.js b/lib/ace/mode/handlebars_highlight_rules.js index e224335f..c264afc1 100644 --- a/lib/ace/mode/handlebars_highlight_rules.js +++ b/lib/ace/mode/handlebars_highlight_rules.js @@ -5,14 +5,14 @@ define(function(require, exports, module) { var oop = require("../lib/oop"); var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules; -var xmlUtil = require("./xml_util"); + function pop2(currentState, stack) { stack.splice(0, 3); return stack.shift() || "start"; } var HandlebarsHighlightRules = function() { HtmlHighlightRules.call(this); - var hbs = { + var hbs = { regex : "(?={{)", push : "handlebars" } diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js index ca9e88a3..5bb1086b 100644 --- a/lib/ace/mode/xml_highlight_rules.js +++ b/lib/ace/mode/xml_highlight_rules.js @@ -3,7 +3,7 @@ * * Copyright (c) 2010, Ajax.org B.V. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright @@ -14,7 +14,7 @@ * * Neither the name of Ajax.org B.V. nor the * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -32,7 +32,6 @@ define(function(require, exports, module) { "use strict"; var oop = require("../lib/oop"); -var xmlUtil = require("./xml_util"); var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var XmlHighlightRules = function(normalize) { diff --git a/lib/ace/mode/xml_util.js b/lib/ace/mode/xml_util.js deleted file mode 100644 index abae6075..00000000 --- a/lib/ace/mode/xml_util.js +++ /dev/null @@ -1,100 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Distributed under the BSD license: - * - * Copyright (c) 2010, Ajax.org B.V. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Ajax.org B.V. nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * ***** END LICENSE BLOCK ***** */ - -define(function(require, exports, module) { -"use strict"; - -function string(state) { - return [{ - token : "string", - regex : '"', - next : state + "_qqstring" - }, { - token : "string", - regex : "'", - next : state + "_qstring" - }]; -} - -function multiLineString(quote, state) { - return [ - {token : "string", regex : quote, next : state}, - { - token : "constant.language.escape", - regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)" - }, - {defaultToken : "string"} - ]; -} - -exports.tag = function(states, name, nextState, tagMap) { - states[name] = [{ - token : "text", - regex : "\\s+" - }, { - //token : "meta.tag", - - token : !tagMap ? "meta.tag.tag-name" : function(value) { - if (tagMap[value]) - return "meta.tag.tag-name." + tagMap[value]; - else - return "meta.tag.tag-name"; - }, - regex : "[-_a-zA-Z0-9:]+", - next : name + "_embed_attribute_list" - }, { - token: "empty", - regex: "", - next : name + "_embed_attribute_list" - }]; - - states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list"); - states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list"); - - states[name + "_embed_attribute_list"] = [{ - token : "meta.tag.r", - regex : "/?>", - next : nextState - }, { - token : "keyword.operator", - regex : "=" - }, { - token : "entity.other.attribute-name", - regex : "[-_a-zA-Z0-9:]+" - }, { - token : "constant.numeric", // float - regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b" - }, { - token : "text", - regex : "\\s+" - }].concat(string(name)); -}; - -});