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:
9
vendor/assets/javascripts/ace/mode-julia.js
vendored
9
vendor/assets/javascripts/ace/mode-julia.js
vendored
@@ -113,7 +113,7 @@ var JuliaHighlightRules = function() {
|
||||
'entity.other.inherited-class.julia' ],
|
||||
regex: '(type|immutable)(\\s+)([a-zA-Z0-9_]+)(?:(\\s*)(<:)(\\s*[.a-zA-Z0-9_:]+))?' },
|
||||
{ token: [ 'other.typed-variable.julia', 'support.type.julia' ],
|
||||
regex: '([a-zA-Z0-9_]+)(::[a-zA-Z0-9_{}]+)' } ] }
|
||||
regex: '([a-zA-Z0-9_]+)(::[a-zA-Z0-9_{}]+)' } ] };
|
||||
|
||||
this.normalizeRules();
|
||||
};
|
||||
@@ -123,7 +123,7 @@ JuliaHighlightRules.metaData = { fileTypes: [ 'jl' ],
|
||||
foldingStartMarker: '^\\s*(?:if|while|for|begin|function|macro|module|baremodule|type|immutable|let)\\b(?!.*\\bend\\b).*$',
|
||||
foldingStopMarker: '^\\s*(?:end)\\b.*$',
|
||||
name: 'Julia',
|
||||
scopeName: 'source.julia' }
|
||||
scopeName: 'source.julia' };
|
||||
|
||||
|
||||
oop.inherits(JuliaHighlightRules, TextHighlightRules);
|
||||
@@ -152,8 +152,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/;
|
||||
@@ -282,6 +282,7 @@ var FoldMode = require("./folding/cstyle").FoldMode;
|
||||
var Mode = function() {
|
||||
this.HighlightRules = JuliaHighlightRules;
|
||||
this.foldingRules = new FoldMode();
|
||||
this.$behaviour = this.$defaultBehaviour;
|
||||
};
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
|
Reference in New Issue
Block a user