735a74901f
Previously, we were at an ACE editor published between 1.1.8 and 1.1.9. This caused multiple issues and was especially a problem for the upcoming pair programming feature. Further, updating ace is a long-time priority, see https://github.com/openHPI/codeocean/issues/250. Now, we are not yet updating to the latest version, but rather to the next minor version. This already contains breaking changes, and we are currently interested to keep the number of changes as low as possible. Further updating ACE might be still a future task. The new ACE version 1.2.0 is taken from this tag: https://github.com/ajaxorg/ace-builds/releases/tag/v1.2.0. We are using the src build (not minified, not in the noconflict version), since the same was used before as well. Further, we need to change our migration for storing editor events. Since the table is not yet used (in production), we also update the enum.
513 lines
17 KiB
JavaScript
513 lines
17 KiB
JavaScript
define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
|
|
"use strict";
|
|
|
|
var oop = require("../lib/oop");
|
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
|
|
|
var DocCommentHighlightRules = function() {
|
|
this.$rules = {
|
|
"start" : [ {
|
|
token : "comment.doc.tag",
|
|
regex : "@[\\w\\d_]+" // TODO: fix email addresses
|
|
},
|
|
DocCommentHighlightRules.getTagRule(),
|
|
{
|
|
defaultToken : "comment.doc",
|
|
caseInsensitive: true
|
|
}]
|
|
};
|
|
};
|
|
|
|
oop.inherits(DocCommentHighlightRules, TextHighlightRules);
|
|
|
|
DocCommentHighlightRules.getTagRule = function(start) {
|
|
return {
|
|
token : "comment.doc.tag.storage.type",
|
|
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
|
|
};
|
|
}
|
|
|
|
DocCommentHighlightRules.getStartRule = function(start) {
|
|
return {
|
|
token : "comment.doc", // doc comment
|
|
regex : "\\/\\*(?=\\*)",
|
|
next : start
|
|
};
|
|
};
|
|
|
|
DocCommentHighlightRules.getEndRule = function (start) {
|
|
return {
|
|
token : "comment.doc", // closing comment
|
|
regex : "\\*\\/",
|
|
next : start
|
|
};
|
|
};
|
|
|
|
|
|
exports.DocCommentHighlightRules = DocCommentHighlightRules;
|
|
|
|
});
|
|
|
|
define("ace/mode/d_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function(require, exports, module) {
|
|
"use strict";
|
|
|
|
var oop = require("../lib/oop");
|
|
var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
|
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
|
|
|
var DHighlightRules = function() {
|
|
|
|
var keywords = (
|
|
"this|super|import|module|body|mixin|__traits|invariant|alias|asm|delete|"+
|
|
"typeof|typeid|sizeof|cast|new|in|is|typedef|__vector|__parameters"
|
|
);
|
|
|
|
var keywordControls = (
|
|
"break|case|continue|default|do|else|for|foreach|foreach_reverse|goto|if|" +
|
|
"return|switch|while|catch|try|throw|finally|version|assert|unittest|with"
|
|
);
|
|
|
|
var types = (
|
|
"auto|bool|char|dchar|wchar|byte|ubyte|float|double|real|" +
|
|
"cfloat|creal|cdouble|cent|ifloat|ireal|idouble|" +
|
|
"int|long|short|void|uint|ulong|ushort|ucent|" +
|
|
"function|delegate|string|wstring|dstring|size_t|ptrdiff_t|hash_t|Object"
|
|
);
|
|
|
|
var modifiers = (
|
|
"abstract|align|debug|deprecated|export|extern|const|final|in|inout|out|" +
|
|
"ref|immutable|lazy|nothrow|override|package|pragma|private|protected|" +
|
|
"public|pure|scope|shared|__gshared|synchronized|static|volatile"
|
|
);
|
|
|
|
var storages = (
|
|
"class|struct|union|template|interface|enum|macro"
|
|
);
|
|
|
|
var stringEscapesSeq = {
|
|
token: "constant.language.escape",
|
|
regex: "\\\\(?:(?:x[0-9A-F]{2})|(?:[0-7]{1,3})|(?:['\"\\?0abfnrtv\\\\])|" +
|
|
"(?:u[0-9a-fA-F]{4})|(?:U[0-9a-fA-F]{8}))"
|
|
};
|
|
|
|
var builtinConstants = (
|
|
"null|true|false|"+
|
|
"__DATE__|__EOF__|__TIME__|__TIMESTAMP__|__VENDOR__|__VERSION__|"+
|
|
"__FILE__|__MODULE__|__LINE__|__FUNCTION__|__PRETTY_FUNCTION__"
|
|
);
|
|
|
|
var operators = (
|
|
"/|/\\=|&|&\\=|&&|\\|\\|\\=|\\|\\||\\-|\\-\\=|\\-\\-|\\+|" +
|
|
"\\+\\=|\\+\\+|\\<|\\<\\=|\\<\\<|\\<\\<\\=|\\<\\>|\\<\\>\\=|\\>|\\>\\=|\\>\\>\\=|" +
|
|
"\\>\\>\\>\\=|\\>\\>|\\>\\>\\>|\\!|\\!\\=|\\!\\<\\>|\\!\\<\\>\\=|\\!\\<|\\!\\<\\=|" +
|
|
"\\!\\>|\\!\\>\\=|\\?|\\$|\\=|\\=\\=|\\*|\\*\\=|%|%\\=|" +
|
|
"\\^|\\^\\=|\\^\\^|\\^\\^\\=|~|~\\=|\\=\\>|#"
|
|
);
|
|
|
|
var keywordMapper = this.$keywords = this.createKeywordMapper({
|
|
"keyword.modifier" : modifiers,
|
|
"keyword.control" : keywordControls,
|
|
"keyword.type" : types,
|
|
"keyword": keywords,
|
|
"keyword.storage": storages,
|
|
"punctation": "\\.|\\,|;|\\.\\.|\\.\\.\\.",
|
|
"keyword.operator" : operators,
|
|
"constant.language": builtinConstants
|
|
}, "identifier");
|
|
|
|
var identifierRe = "[a-zA-Z_\u00a1-\uffff][a-zA-Z\\d_\u00a1-\uffff]*\\b";
|
|
|
|
this.$rules = {
|
|
"start" : [
|
|
{ //-------------------------------------------------------- COMMENTS
|
|
token : "comment",
|
|
regex : "\\/\\/.*$"
|
|
},
|
|
DocCommentHighlightRules.getStartRule("doc-start"),
|
|
{
|
|
token : "comment", // multi line comment
|
|
regex : "\\/\\*",
|
|
next : "star-comment"
|
|
}, {
|
|
token: "comment.shebang",
|
|
regex: "^\s*#!.*"
|
|
}, {
|
|
token : "comment",
|
|
regex : "\\/\\+",
|
|
next: "plus-comment"
|
|
}, { //-------------------------------------------------------- STRINGS
|
|
onMatch: function(value, currentState, state) {
|
|
state.unshift(this.next, value.substr(2));
|
|
return "string";
|
|
},
|
|
regex: 'q"(?:[\\[\\(\\{\\<]+)',
|
|
next: 'operator-heredoc-string'
|
|
}, {
|
|
onMatch: function(value, currentState, state) {
|
|
state.unshift(this.next, value.substr(2));
|
|
return "string";
|
|
},
|
|
regex: 'q"(?:[a-zA-Z_]+)$',
|
|
next: 'identifier-heredoc-string'
|
|
}, {
|
|
token : "string", // multi line string start
|
|
regex : '[xr]?"',
|
|
next : "quote-string"
|
|
}, {
|
|
token : "string", // multi line string start
|
|
regex : '[xr]?`',
|
|
next : "backtick-string"
|
|
}, {
|
|
token : "string", // single line
|
|
regex : "[xr]?['](?:(?:\\\\.)|(?:[^'\\\\]))*?['][cdw]?"
|
|
}, { //-------------------------------------------------------- RULES
|
|
token: ["keyword", "text", "paren.lparen"],
|
|
regex: /(asm)(\s*)({)/,
|
|
next: "d-asm"
|
|
}, {
|
|
token: ["keyword", "text", "paren.lparen", "constant.language"],
|
|
regex: "(__traits)(\\s*)(\\()("+identifierRe+")"
|
|
}, { // import|module abc
|
|
token: ["keyword", "text", "variable.module"],
|
|
regex: "(import|module)(\\s+)((?:"+identifierRe+"\\.?)*)"
|
|
}, { // storage Name
|
|
token: ["keyword.storage", "text", "entity.name.type"],
|
|
regex: "("+storages+")(\\s*)("+identifierRe+")"
|
|
}, { // alias|typedef foo bar;
|
|
token: ["keyword", "text", "variable.storage", "text"],
|
|
regex: "(alias|typedef)(\\s*)("+identifierRe+")(\\s*)"
|
|
}, { //-------------------------------------------------------- OTHERS
|
|
token : "constant.numeric", // hex
|
|
regex : "0[xX][0-9a-fA-F_]+(l|ul|u|f|F|L|U|UL)?\\b"
|
|
}, {
|
|
token : "constant.numeric", // float
|
|
regex : "[+-]?\\d[\\d_]*(?:(?:\\.[\\d_]*)?(?:[eE][+-]?[\\d_]+)?)?(l|ul|u|f|F|L|U|UL)?\\b"
|
|
}, {
|
|
token: "entity.other.attribute-name",
|
|
regex: "@"+identifierRe
|
|
}, {
|
|
token : keywordMapper,
|
|
regex : "[a-zA-Z_][a-zA-Z0-9_]*\\b"
|
|
}, {
|
|
token : "keyword.operator",
|
|
regex : operators
|
|
}, {
|
|
token : "punctuation.operator",
|
|
regex : "\\?|\\:|\\,|\\;|\\.|\\:"
|
|
}, {
|
|
token : "paren.lparen",
|
|
regex : "[[({]"
|
|
}, {
|
|
token : "paren.rparen",
|
|
regex : "[\\])}]"
|
|
}, {
|
|
token : "text",
|
|
regex : "\\s+"
|
|
}
|
|
],
|
|
"star-comment" : [
|
|
{
|
|
token : "comment", // closing comment
|
|
regex : "\\*\\/",
|
|
next : "start"
|
|
}, {
|
|
defaultToken: 'comment'
|
|
}
|
|
],
|
|
"plus-comment" : [
|
|
{
|
|
token : "comment", // closing comment
|
|
regex : "\\+\\/",
|
|
next : "start"
|
|
}, {
|
|
defaultToken: 'comment'
|
|
}
|
|
],
|
|
|
|
"quote-string" : [
|
|
stringEscapesSeq,
|
|
{
|
|
token : "string",
|
|
regex : '"[cdw]?',
|
|
next : "start"
|
|
}, {
|
|
defaultToken: 'string'
|
|
}
|
|
],
|
|
|
|
"backtick-string" : [
|
|
stringEscapesSeq,
|
|
{
|
|
token : "string",
|
|
regex : '`[cdw]?',
|
|
next : "start"
|
|
}, {
|
|
defaultToken: 'string'
|
|
}
|
|
],
|
|
|
|
"operator-heredoc-string": [
|
|
{
|
|
onMatch: function(value, currentState, state) {
|
|
value = value.substring(value.length-2, value.length-1);
|
|
var map = {'>':'<',']':'[',')':'(','}':'{'};
|
|
if(Object.keys(map).indexOf(value) != -1)
|
|
value = map[value];
|
|
if(value != state[1]) return "string";
|
|
state.shift();
|
|
state.shift();
|
|
|
|
return "string";
|
|
},
|
|
regex: '(?:[\\]\\)}>]+)"',
|
|
next: 'start'
|
|
}, {
|
|
token: 'string',
|
|
regex: '[^\\]\\)}>]+'
|
|
}
|
|
],
|
|
|
|
"identifier-heredoc-string": [
|
|
{
|
|
onMatch: function(value, currentState, state) {
|
|
value = value.substring(0, value.length-1);
|
|
if(value != state[1]) return "string";
|
|
state.shift();
|
|
state.shift();
|
|
|
|
return "string";
|
|
},
|
|
regex: '^(?:[A-Za-z_][a-zA-Z0-9]+)"',
|
|
next: 'start'
|
|
}, {
|
|
token: 'string',
|
|
regex: '[^\\]\\)}>]+'
|
|
}
|
|
],
|
|
|
|
"d-asm": [
|
|
{
|
|
token: "paren.rparen",
|
|
regex: "\\}",
|
|
next: "start"
|
|
}, {
|
|
token: 'keyword.instruction',
|
|
regex: '[a-zA-Z]+',
|
|
next: 'd-asm-instruction'
|
|
}, {
|
|
token: "text",
|
|
regex: "\\s+"
|
|
}
|
|
],
|
|
'd-asm-instruction': [
|
|
{
|
|
token: 'constant.language',
|
|
regex: /AL|AH|AX|EAX|BL|BH|BX|EBX|CL|CH|CX|ECX|DL|DH|DX|EDX|BP|EBP|SP|ESP|DI|EDI|SI|ESI/i
|
|
}, {
|
|
token: 'identifier',
|
|
regex: '[a-zA-Z]+'
|
|
}, {
|
|
token: 'string',
|
|
regex: '".*"'
|
|
}, {
|
|
token: 'comment',
|
|
regex: '//.*$'
|
|
}, {
|
|
token: 'constant.numeric',
|
|
regex: '[0-9.xA-F]+'
|
|
}, {
|
|
token: 'punctuation.operator',
|
|
regex: '\\,'
|
|
}, {
|
|
token: 'punctuation.operator',
|
|
regex: ';',
|
|
next: 'd-asm'
|
|
}, {
|
|
token: 'text',
|
|
regex: '\\s+'
|
|
}
|
|
]
|
|
};
|
|
|
|
this.embedRules(DocCommentHighlightRules, "doc-",
|
|
[ DocCommentHighlightRules.getEndRule("start") ]);
|
|
};
|
|
|
|
DHighlightRules.metaData = {
|
|
comment: 'D language',
|
|
fileTypes: [ 'd', 'di' ],
|
|
firstLineMatch: '^#!.*\\b[glr]?dmd\\b.',
|
|
foldingStartMarker: '(?x)/\\*\\*(?!\\*)|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))',
|
|
foldingStopMarker: '(?<!\\*)\\*\\*/|^\\s*\\}',
|
|
keyEquivalent: '^~D',
|
|
name: 'D',
|
|
scopeName: 'source.d'
|
|
};
|
|
oop.inherits(DHighlightRules, TextHighlightRules);
|
|
|
|
exports.DHighlightRules = DHighlightRules;
|
|
});
|
|
|
|
define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
|
|
"use strict";
|
|
|
|
var oop = require("../../lib/oop");
|
|
var Range = require("../../range").Range;
|
|
var BaseFoldMode = require("./fold_mode").FoldMode;
|
|
|
|
var FoldMode = exports.FoldMode = function(commentRegex) {
|
|
if (commentRegex) {
|
|
this.foldingStartMarker = new RegExp(
|
|
this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
|
|
);
|
|
this.foldingStopMarker = new RegExp(
|
|
this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
|
|
);
|
|
}
|
|
};
|
|
oop.inherits(FoldMode, BaseFoldMode);
|
|
|
|
(function() {
|
|
|
|
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
|
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
|
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
|
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
|
this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
|
|
this._getFoldWidgetBase = this.getFoldWidget;
|
|
this.getFoldWidget = function(session, foldStyle, row) {
|
|
var line = session.getLine(row);
|
|
|
|
if (this.singleLineBlockCommentRe.test(line)) {
|
|
if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
|
|
return "";
|
|
}
|
|
|
|
var fw = this._getFoldWidgetBase(session, foldStyle, row);
|
|
|
|
if (!fw && this.startRegionRe.test(line))
|
|
return "start"; // lineCommentRegionStart
|
|
|
|
return fw;
|
|
};
|
|
|
|
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
|
|
var line = session.getLine(row);
|
|
|
|
if (this.startRegionRe.test(line))
|
|
return this.getCommentRegionBlock(session, line, row);
|
|
|
|
var match = line.match(this.foldingStartMarker);
|
|
if (match) {
|
|
var i = match.index;
|
|
|
|
if (match[1])
|
|
return this.openingBracketBlock(session, match[1], row, i);
|
|
|
|
var range = session.getCommentFoldRange(row, i + match[0].length, 1);
|
|
|
|
if (range && !range.isMultiLine()) {
|
|
if (forceMultiline) {
|
|
range = this.getSectionRange(session, row);
|
|
} else if (foldStyle != "all")
|
|
range = null;
|
|
}
|
|
|
|
return range;
|
|
}
|
|
|
|
if (foldStyle === "markbegin")
|
|
return;
|
|
|
|
var match = line.match(this.foldingStopMarker);
|
|
if (match) {
|
|
var i = match.index + match[0].length;
|
|
|
|
if (match[1])
|
|
return this.closingBracketBlock(session, match[1], row, i);
|
|
|
|
return session.getCommentFoldRange(row, i, -1);
|
|
}
|
|
};
|
|
|
|
this.getSectionRange = function(session, row) {
|
|
var line = session.getLine(row);
|
|
var startIndent = line.search(/\S/);
|
|
var startRow = row;
|
|
var startColumn = line.length;
|
|
row = row + 1;
|
|
var endRow = row;
|
|
var maxRow = session.getLength();
|
|
while (++row < maxRow) {
|
|
line = session.getLine(row);
|
|
var indent = line.search(/\S/);
|
|
if (indent === -1)
|
|
continue;
|
|
if (startIndent > indent)
|
|
break;
|
|
var subRange = this.getFoldWidgetRange(session, "all", row);
|
|
|
|
if (subRange) {
|
|
if (subRange.start.row <= startRow) {
|
|
break;
|
|
} else if (subRange.isMultiLine()) {
|
|
row = subRange.end.row;
|
|
} else if (startIndent == indent) {
|
|
break;
|
|
}
|
|
}
|
|
endRow = row;
|
|
}
|
|
|
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
|
};
|
|
this.getCommentRegionBlock = function(session, line, row) {
|
|
var startColumn = line.search(/\s*$/);
|
|
var maxRow = session.getLength();
|
|
var startRow = row;
|
|
|
|
var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
|
|
var depth = 1;
|
|
while (++row < maxRow) {
|
|
line = session.getLine(row);
|
|
var m = re.exec(line);
|
|
if (!m) continue;
|
|
if (m[1]) depth--;
|
|
else depth++;
|
|
|
|
if (!depth) break;
|
|
}
|
|
|
|
var endRow = row;
|
|
if (endRow > startRow) {
|
|
return new Range(startRow, startColumn, endRow, line.length);
|
|
}
|
|
};
|
|
|
|
}).call(FoldMode.prototype);
|
|
|
|
});
|
|
|
|
define("ace/mode/d",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/d_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
|
|
"use strict";
|
|
|
|
var oop = require("../lib/oop");
|
|
var TextMode = require("./text").Mode;
|
|
var DHighlightRules = require("./d_highlight_rules").DHighlightRules;
|
|
var FoldMode = require("./folding/cstyle").FoldMode;
|
|
|
|
var Mode = function() {
|
|
this.HighlightRules = DHighlightRules;
|
|
this.foldingRules = new FoldMode();
|
|
};
|
|
oop.inherits(Mode, TextMode);
|
|
|
|
(function() {
|
|
this.lineCommentStart = "//";
|
|
this.blockComment = {start: "/*", end: "*/"};
|
|
this.$id = "ace/mode/d";
|
|
}).call(Mode.prototype);
|
|
|
|
exports.Mode = Mode;
|
|
});
|