Update ACE Editor to version 1.2.9
The new ACE editor introduces full support for emojis (and, thereby, UTF-16 characters with high- and low-surrogates). Hence, we can remove our custom fix. Further, this update will allow emojis to be used in pair programming sessions.
This commit is contained in:
17
vendor/assets/javascripts/ace/mode-erlang.js
vendored
17
vendor/assets/javascripts/ace/mode-erlang.js
vendored
@ -472,7 +472,7 @@ var ErlangHighlightRules = function() {
|
||||
'punctuation.definition.parameters.end.erlang',
|
||||
'meta.directive.ifdef.erlang',
|
||||
'punctuation.section.directive.end.erlang' ],
|
||||
regex: '^(\\s*)(-)(\\s*)(ifdef)(\\s*)(\\()(\\s*)([a-zA-z\\d@_]+)(\\s*)(\\))(\\s*)(\\.)' },
|
||||
regex: '^(\\s*)(-)(\\s*)(ifdef)(\\s*)(\\()(\\s*)([a-zA-Z\\d@_]+)(\\s*)(\\))(\\s*)(\\.)' },
|
||||
{ token:
|
||||
[ 'meta.directive.ifndef.erlang',
|
||||
'punctuation.section.directive.begin.erlang',
|
||||
@ -486,7 +486,7 @@ var ErlangHighlightRules = function() {
|
||||
'punctuation.definition.parameters.end.erlang',
|
||||
'meta.directive.ifndef.erlang',
|
||||
'punctuation.section.directive.end.erlang' ],
|
||||
regex: '^(\\s*)(-)(\\s*)(ifndef)(\\s*)(\\()(\\s*)([a-zA-z\\d@_]+)(\\s*)(\\))(\\s*)(\\.)' },
|
||||
regex: '^(\\s*)(-)(\\s*)(ifndef)(\\s*)(\\()(\\s*)([a-zA-Z\\d@_]+)(\\s*)(\\))(\\s*)(\\.)' },
|
||||
{ token:
|
||||
[ 'meta.directive.undef.erlang',
|
||||
'punctuation.section.directive.begin.erlang',
|
||||
@ -500,7 +500,7 @@ var ErlangHighlightRules = function() {
|
||||
'punctuation.definition.parameters.end.erlang',
|
||||
'meta.directive.undef.erlang',
|
||||
'punctuation.section.directive.end.erlang' ],
|
||||
regex: '^(\\s*)(-)(\\s*)(undef)(\\s*)(\\()(\\s*)([a-zA-z\\d@_]+)(\\s*)(\\))(\\s*)(\\.)' } ],
|
||||
regex: '^(\\s*)(-)(\\s*)(undef)(\\s*)(\\()(\\s*)([a-zA-Z\\d@_]+)(\\s*)(\\))(\\s*)(\\.)' } ],
|
||||
'#macro-usage':
|
||||
[ { token:
|
||||
[ 'keyword.operator.macro.erlang',
|
||||
@ -820,7 +820,7 @@ var ErlangHighlightRules = function() {
|
||||
{ defaultToken: 'meta.structure.tuple.erlang' } ] } ],
|
||||
'#variable':
|
||||
[ { token: [ 'variable.other.erlang', 'variable.language.omitted.erlang' ],
|
||||
regex: '(_[a-zA-Z\\d@_]+|[A-Z][a-zA-Z\\d@_]*)|(_)' } ] }
|
||||
regex: '(_[a-zA-Z\\d@_]+|[A-Z][a-zA-Z\\d@_]*)|(_)' } ] };
|
||||
|
||||
this.normalizeRules();
|
||||
};
|
||||
@ -829,7 +829,7 @@ ErlangHighlightRules.metaData = { comment: 'The recognition of function definiti
|
||||
fileTypes: [ 'erl', 'hrl' ],
|
||||
keyEquivalent: '^~E',
|
||||
name: 'Erlang',
|
||||
scopeName: 'source.erlang' }
|
||||
scopeName: 'source.erlang' };
|
||||
|
||||
|
||||
oop.inherits(ErlangHighlightRules, TextHighlightRules);
|
||||
@ -858,8 +858,8 @@ oop.inherits(FoldMode, BaseFoldMode);
|
||||
|
||||
(function() {
|
||||
|
||||
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
|
||||
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
||||
this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
|
||||
this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
|
||||
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
||||
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
||||
this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
|
||||
@ -988,12 +988,13 @@ var FoldMode = require("./folding/cstyle").FoldMode;
|
||||
var Mode = function() {
|
||||
this.HighlightRules = ErlangHighlightRules;
|
||||
this.foldingRules = new FoldMode();
|
||||
this.$behaviour = this.$defaultBehaviour;
|
||||
};
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
this.lineCommentStart = "%";
|
||||
this.blockComment = {start: "/*", end: "*/"};
|
||||
this.blockComment = null;
|
||||
this.$id = "ace/mode/erlang";
|
||||
}).call(Mode.prototype);
|
||||
|
||||
|
Reference in New Issue
Block a user