Syntax highlighting using Ace language modes and themes.
+ + + + + + + + diff --git a/demo/static-highlighter/server.js b/demo/static-highlighter/server.js new file mode 100644 index 00000000..a58b00b6 --- /dev/null +++ b/demo/static-highlighter/server.js @@ -0,0 +1,36 @@ +/** + * Simple node.js server, which generates the synax highlighted version of itself + * using the Ace modes and themes on the server and serving a static web page. + */ + +// include ace search path and modules +require("../../support/paths"); + +// load jsdom, which is required by Ace +require("ace/test/mockdom"); + +var http = require("http"); +var fs = require("fs"); + +// load the highlighter and the desired mode and theme +var highlighter = require("ace/ext/static_highlight"); +var JavaScriptMode = require("ace/mode/javascript").Mode; +var theme = require("ace/theme/twilight"); + +var port = process.env.PORT || 2222; + +http.createServer(function(req, res) { + res.writeHead(200, {"Content-Type": "text/html"}); + + fs.readFile(__filename, "utf8", function(err, data) { + var highlighted = highlighter.render(data, new JavaScriptMode(), theme); + res.end('\n\ +\n\ +:html:\n\ +'.replace(":css:", highlighted.css).replace(":html:", highlighted.html)); + }); +}).listen(port); + +console.log("Listening on port " + port); \ No newline at end of file diff --git a/kitchen-sink.html b/kitchen-sink.html index 572e71c4..9c7a90d7 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -6,7 +6,7 @@
+ 
|
@@ -189,20 +189,20 @@
-
+
diff --git a/lib/ace/ext/static.css b/lib/ace/ext/static.css
new file mode 100644
index 00000000..d048034f
--- /dev/null
+++ b/lib/ace/ext/static.css
@@ -0,0 +1,22 @@
+.ace_editor {
+ font-family: 'Monaco', 'Menlo', 'Droid Sans Mono', 'Courier New', monospace;
+ font-size: 12px;
+}
+
+.ace_editor .ace_gutter {
+ width: 25px !important;
+ display: block;
+ float: left;
+ text-align: right;
+ padding: 0 3px 0 0;
+ margin-right: 3px;
+}
+
+.ace-row { clear: both; }
+
+*.ace_gutter-cell {
+ -moz-user-select: -moz-none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+}
\ No newline at end of file
diff --git a/lib/ace/ext/static_highlight.js b/lib/ace/ext/static_highlight.js
new file mode 100644
index 00000000..bcdf10eb
--- /dev/null
+++ b/lib/ace/ext/static_highlight.js
@@ -0,0 +1,95 @@
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Jan Jongboom ");
+ stringBuilder.push("" + (ix+1) + "");
+ textLayer.$renderLine(stringBuilder, 0, lineTokens, true);
+ stringBuilder.push(" ");
+ }
+
+ // let's prepare the whole html
+ var html = "\
+ ".replace(/:cssClass/, theme.cssClass).replace(/:code/, stringBuilder.join(""));
+
+ textLayer.destroy();
+
+ return {
+ css: baseStyles + theme.cssText,
+ html: html
+ };
+};
+
+});
\ No newline at end of file
diff --git a/lib/ace/ext/static_highlight_test.js b/lib/ace/ext/static_highlight_test.js
new file mode 100644
index 00000000..e2658073
--- /dev/null
+++ b/lib/ace/ext/static_highlight_test.js
@@ -0,0 +1,74 @@
+if (typeof process !== "undefined") {
+ require("../../../support/paths");
+ require("ace/test/mockdom");
+}
+
+var assert = require("assert");
+var highlighter = require("./static_highlight");
+var JavaScriptMode = require("ace/mode/javascript").Mode;
+
+// Execution ORDER: test.setUpSuite, setUp, testFn, tearDown, test.tearDownSuite
+module.exports = {
+ timeout: 10000,
+
+ "test simple snippet": function(next) {
+ var theme = require("ace/theme/tomorrow");
+ var snippet = "/** this is a function\n\
+*\n\
+*/\n\
+function hello (a, b, c) {\n\
+ console.log(a * b + c + 'sup?');\n\
+}";
+ var mode = new JavaScriptMode();
+
+ var isError = false, result;
+ try {
+ result = highlighter.render(snippet, mode, theme);
+ }
+ catch (e) {
+ console.log(e);
+ isError = true;
+ }
+ // todo: write something more meaningful
+ assert.equal(isError, false);
+
+ next();
+ },
+
+ "test css from theme is used": function(next) {
+ var theme = require("ace/theme/tomorrow");
+ var snippet = "/** this is a function\n\
+*\n\
+*/\n\
+function hello (a, b, c) {\n\
+ console.log(a * b + c + 'sup?');\n\
+}";
+ var mode = new JavaScriptMode();
+
+ var isError = false, result;
+ result = highlighter.render(snippet, mode, theme);
+
+ assert.equal(result.css, theme.cssText);
+
+ next();
+ },
+
+ "test theme classname should be in output html": function (next) {
+ var theme = require("ace/theme/tomorrow");
+ var snippet = "/** this is a function\n\
+*\n\
+*/\n\
+function hello (a, b, c) {\n\
+ console.log(a * b + c + 'sup?');\n\
+}";
+ var mode = new JavaScriptMode();
+
+ var isError = false, result;
+ result = highlighter.render(snippet, mode, theme);
+ assert.equal(!!result.html.match(/\
+ :code\
+ \
+ /), true);
+
+ next();
+ }
+};
+
+!module.parent && require("asyncjs").test.testcase(module.exports).exec();
diff --git a/lib/ace/test/mockrenderer.js b/lib/ace/test/mockrenderer.js
index 3c0c4342..ad8a24d7 100644
--- a/lib/ace/test/mockrenderer.js
+++ b/lib/ace/test/mockrenderer.js
@@ -161,4 +161,8 @@ MockRenderer.prototype.textToScreenCoordinates = function() {
}
};
+MockRenderer.prototype.adjustWrapLimit = function () {
+
+};
+
});
diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js
index 977c4d33..e91cd3c5 100644
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@@ -37,9 +37,7 @@
define(function(require, exports, module) {
- var dom = require("pilot/dom");
-
- var cssText = ".ace-tomorrow .ace_editor {\
+ exports.cssText = ".ace-tomorrow .ace_editor {\
border: 2px solid rgb(159, 159, 159);\
}\
\
@@ -254,8 +252,5 @@ background-color:#8959A8;\
\
}";
- // import CSS once
- dom.importCssString(cssText);
-
exports.cssClass = "ace-tomorrow";
});
\ No newline at end of file
diff --git a/support/pilot b/support/pilot
index c720ab56..f1ac22a9 160000
--- a/support/pilot
+++ b/support/pilot
@@ -1 +1 @@
-Subproject commit c720ab56a80ba8cc10d0c86a9c4f1fa9cfc83b1b
+Subproject commit f1ac22a9bc806772ae68fd67d800fc0625518346
|