jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix static_highlight

Browse source
This commit is contained in:
nightwing 2012-08-21 20:20:02 +04:00
commit 86100b5ebe
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/ext/static_highlight.js
View file

@ -70,12 +70,12 @@ exports.render = function(input, mode, theme, lineStart, disableGutter) {
var stringBuilder = []; var stringBuilder = [];
var length = session.getLength(); var length = session.getLength();
for(var ix = 0; ix < length; ix++) { for(var ix = 0; ix < length; ix++) {
stringBuilder.push("<div class='ace_line'>"); stringBuilder.push("<div class='ace_line'>");
if (!disableGutter) if (!disableGutter)
stringBuilder.push("<span class='ace_gutter ace_gutter-cell' unselectable='on'>" + (ix + lineStart) + "</span>"); stringBuilder.push("<span class='ace_gutter ace_gutter-cell' unselectable='on'>" + (ix + lineStart) + "</span>");
textLayer.$renderLine(stringBuilder, 0, true, false); textLayer.$renderLine(stringBuilder, ix, true, false);
stringBuilder.push("</div>"); stringBuilder.push("</div>");
} }

23
lib/ace/ext/static_highlight_test.js
View file

@ -16,7 +16,8 @@ module.exports = {
"test simple snippet": function(next) { "test simple snippet": function(next) {
var theme = require("../theme/tomorrow"); var theme = require("../theme/tomorrow");
var snippet = "/** this is a function\n\ var snippet = "\
/** this is a function\n\
*\n\ *\n\
*/\n\ */\n\
function hello (a, b, c) {\n\ function hello (a, b, c) {\n\
@ -24,23 +25,16 @@ function hello (a, b, c) {\n\
}"; }";
var mode = new JavaScriptMode(); var mode = new JavaScriptMode();
var isError = false, result; var result = highlighter.render(snippet, mode, theme);
try { assert.equal(result.html, "<div class='ace-tomorrow'> <div class='ace_editor ace_scroller ace_text-layer'> <div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>1</span><span class='ace_comment ace_doc'>/**&#160;this&#160;is&#160;a&#160;function</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>2</span><span class='ace_comment ace_doc'>*</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>3</span><span class='ace_comment ace_doc'>*/</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>4</span><span class='ace_storage ace_type'>function</span>&#160;<span class='ace_entity ace_name ace_function'>hello</span>&#160;<span class='ace_paren ace_lparen'>(</span><span class='ace_variable ace_parameter'>a</span><span class='ace_punctuation ace_operator'>,&#160;</span><span class='ace_variable ace_parameter'>b</span><span class='ace_punctuation ace_operator'>,&#160;</span><span class='ace_variable ace_parameter'>c</span><span class='ace_paren ace_rparen'>)</span>&#160;<span class='ace_paren ace_lparen'>{</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>5</span>&#160;&#160;&#160;&#160;<span class='ace_storage ace_type'>console</span><span class='ace_punctuation ace_operator'>.</span><span class='ace_support ace_function ace_firebug'>log</span><span class='ace_paren ace_lparen'>(</span><span class='ace_identifier'>a</span>&#160;<span class='ace_keyword ace_operator'>*</span>&#160;<span class='ace_identifier'>b</span>&#160;<span class='ace_keyword ace_operator'>+</span>&#160;<span class='ace_identifier'>c</span>&#160;<span class='ace_keyword ace_operator'>+</span>&#160;<span class='ace_string'>'sup?'</span><span class='ace_paren ace_rparen'>)</span><span class='ace_punctuation ace_operator'>;</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>6</span><span class='ace_paren ace_rparen'>}</span></div> </div> </div>");
result = highlighter.render(snippet, mode, theme); assert.ok(!!result.css);
}
catch (e) {
console.log(e);
isError = true;
}
// todo: write something more meaningful
assert.equal(isError, false);
next(); next();
}, },
"test css from theme is used": function(next) { "test css from theme is used": function(next) {
var theme = require("../theme/tomorrow"); var theme = require("../theme/tomorrow");
var snippet = "/** this is a function\n\ var snippet = "\
/** this is a function\n\
*\n\ *\n\
*/\n\ */\n\
function hello (a, b, c) {\n\ function hello (a, b, c) {\n\
@ -58,7 +52,8 @@ function hello (a, b, c) {\n\
"test theme classname should be in output html": function (next) { "test theme classname should be in output html": function (next) {
var theme = require("../theme/tomorrow"); var theme = require("../theme/tomorrow");
var snippet = "/** this is a function\n\ var snippet = "\
/** this is a function\n\
*\n\ *\n\
*/\n\ */\n\
function hello (a, b, c) {\n\ function hello (a, b, c) {\n\