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:
16
vendor/assets/javascripts/ace/mode-lua.js
vendored
16
vendor/assets/javascripts/ace/mode-lua.js
vendored
@ -40,17 +40,14 @@ var LuaHighlightRules = function() {
|
||||
|
||||
var stdLibaries = ("string|package|os|io|math|debug|table|coroutine");
|
||||
|
||||
var futureReserved = "";
|
||||
|
||||
var deprecatedIn5152 = ("setn|foreach|foreachi|gcinfo|log10|maxn");
|
||||
|
||||
var keywordMapper = this.createKeywordMapper({
|
||||
"keyword": keywords,
|
||||
"support.function": functions,
|
||||
"invalid.deprecated": deprecatedIn5152,
|
||||
"keyword.deprecated": deprecatedIn5152,
|
||||
"constant.library": stdLibaries,
|
||||
"constant.language": builtinConstants,
|
||||
"invalid.illegal": futureReserved,
|
||||
"variable.language": "self"
|
||||
}, "identifier");
|
||||
|
||||
@ -99,7 +96,7 @@ var LuaHighlightRules = function() {
|
||||
stateName: "bracketedString",
|
||||
onMatch : function(value, currentState, stack){
|
||||
stack.unshift(this.next, value.length, currentState);
|
||||
return "comment";
|
||||
return "string.start";
|
||||
},
|
||||
regex : /\[=*\[/,
|
||||
next : [
|
||||
@ -112,13 +109,13 @@ var LuaHighlightRules = function() {
|
||||
} else {
|
||||
this.next = "";
|
||||
}
|
||||
return "comment";
|
||||
return "string.end";
|
||||
},
|
||||
|
||||
regex : /\]=*\]/,
|
||||
next : "start"
|
||||
}, {
|
||||
defaultToken : "comment"
|
||||
defaultToken : "string"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -153,7 +150,7 @@ var LuaHighlightRules = function() {
|
||||
};
|
||||
|
||||
this.normalizeRules();
|
||||
}
|
||||
};
|
||||
|
||||
oop.inherits(LuaHighlightRules, TextHighlightRules);
|
||||
|
||||
@ -308,6 +305,7 @@ var Mode = function() {
|
||||
this.HighlightRules = LuaHighlightRules;
|
||||
|
||||
this.foldingRules = new LuaFoldMode();
|
||||
this.$behaviour = this.$defaultBehaviour;
|
||||
};
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
@ -398,7 +396,7 @@ oop.inherits(Mode, TextMode);
|
||||
var tabLength = session.getTabString().length;
|
||||
var expectedIndent = prevIndent + tabLength * getNetIndentLevel(prevTokens);
|
||||
var curIndent = this.$getIndent(session.getLine(row)).length;
|
||||
if (curIndent < expectedIndent) {
|
||||
if (curIndent <= expectedIndent) {
|
||||
return;
|
||||
}
|
||||
session.outdentRows(new Range(row, 0, row + 2, 0));
|
||||
|
Reference in New Issue
Block a user