Skip to content

Commit

Permalink
update ACE to 1.1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@thlorenz
Mark Storus authored and thlorenz committed Apr 8, 2015
1 parent 7907a23 commit 1698c25
Show file tree
Hide file tree
Showing 107 changed files with 15,164 additions and 4,824 deletions.
2 changes: 1 addition & 1 deletion build/update.js
View file
Expand Up @@ -19,7 +19,7 @@ var workersrcdir = path.join(braceroot, 'workersrc');
var workerdir = path.join(braceroot, 'worker');
var buildroot = path.join(__dirname, 'ace-build');

var aceTag = 'v1.1.8';
var aceTag = 'v1.1.9';

+function updateCleanAndPutInOrder() {

Expand Down
74 changes: 45 additions & 29 deletions ext/language_tools.js
View file
Expand Up @@ -1069,8 +1069,11 @@ var AcePopup = function(parentNode) {

if (data.meta) {
var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
if (data.meta.length + data.caption.length < maxW - 2)
tokens.push({type: "rightAlignedText", value: data.meta});
var metaData = data.meta;
if (metaData.length + data.caption.length > maxW - 2) {
metaData = metaData.substr(0, maxW - data.caption.length - 3) + "\u2026"
}
tokens.push({type: "rightAlignedText", value: metaData});
}
return tokens;
};
Expand All @@ -1080,6 +1083,8 @@ var AcePopup = function(parentNode) {
popup.session.$computeWidth = function() {
return this.screenWidth = 0;
};

popup.$blockScrolling = Infinity;
popup.isOpen = false;
popup.isTopdown = false;

Expand Down Expand Up @@ -1111,6 +1116,7 @@ var AcePopup = function(parentNode) {
popup.on("changeSelection", function() {
if (popup.isOpen)
popup.setRow(popup.selection.lead.row);
popup.renderer.scrollCursorIntoView();
});

popup.hide = function() {
Expand Down Expand Up @@ -1263,8 +1269,10 @@ var dom = acequire("./lib/dom");
var snippetManager = acequire("./snippets").snippetManager;

var Autocomplete = function() {
this.autoInsert = true;
this.autoInsert = false;
this.autoSelect = true;
this.exactMatch = false;
this.gatherCompletionsId = 0;
this.keyboardHandler = new HashHandler();
this.keyboardHandler.bindKeys(this.commands);

Expand All @@ -1281,7 +1289,6 @@ var Autocomplete = function() {
};

(function() {
this.gatherCompletionsId = 0;

this.$init = function() {
this.popup = new AcePopup(document.body || document.documentElement);
Expand All @@ -1306,6 +1313,8 @@ var Autocomplete = function() {

this.popup.setData(this.completions.filtered);

editor.keyBinding.addKeyboardHandler(this.keyboardHandler);

var renderer = editor.renderer;
this.popup.setRow(this.autoSelect ? 0 : -1);
if (!keepPopupPosition) {
Expand Down Expand Up @@ -1337,11 +1346,10 @@ var Autocomplete = function() {
this.changeTimer.cancel();
this.hideDocTooltip();

if (this.popup && this.popup.isOpen) {
this.gatherCompletionsId += 1;
this.gatherCompletionsId += 1;
if (this.popup && this.popup.isOpen)
this.popup.hide();
}


if (this.base)
this.base.detach();
this.activated = false;
Expand All @@ -1362,7 +1370,7 @@ var Autocomplete = function() {
this.blurListener = function(e) {
var el = document.activeElement;
var text = this.editor.textInput.getElement()
if (el != text && el.parentNode != this.popup.container
if (el != text && ( !this.popup || el.parentNode != this.popup.container )
&& el != this.tooltipNode && e.relatedTarget != this.tooltipNode
&& e.relatedTarget != text
) {
Expand Down Expand Up @@ -1424,7 +1432,6 @@ var Autocomplete = function() {
"Ctrl-Down|Ctrl-End": function(editor) { editor.completer.goTo("end"); },

"Esc": function(editor) { editor.completer.detach(); },
"Space": function(editor) { editor.completer.detach(); editor.insert(" ");},
"Return": function(editor) { return editor.completer.insertMatch(); },
"Shift-Return": function(editor) { editor.completer.insertMatch(true); },
"Tab": function(editor) {
Expand All @@ -1448,7 +1455,7 @@ var Autocomplete = function() {

this.base = session.doc.createAnchor(pos.row, pos.column - prefix.length);
this.base.$insertRight = true;

var matches = [];
var total = editor.completers.length;
editor.completers.forEach(function(completer, i) {
Expand Down Expand Up @@ -1480,7 +1487,6 @@ var Autocomplete = function() {
editor.completer = this;
}

editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
editor.on("changeSelection", this.changeListener);
editor.on("blur", this.blurListener);
editor.on("mousedown", this.mousedownListener);
Expand Down Expand Up @@ -1514,13 +1520,17 @@ var Autocomplete = function() {

var prefix = results.prefix;
var matches = results && results.matches;

if (!matches || !matches.length)
return detachIfFinished();
if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
return;

this.completions = new FilteredList(matches);

if (this.exactMatch)
this.completions.exactMatch = true;

this.completions.setFilter(prefix);
var filtered = this.completions.filtered;
if (!filtered.length)
Expand Down Expand Up @@ -1612,7 +1622,7 @@ Autocomplete.startCommand = {
exec: function(editor) {
if (!editor.completer)
editor.completer = new Autocomplete();
editor.completer.autoInsert =
editor.completer.autoInsert = false;
editor.completer.autoSelect = true;
editor.completer.showPopup(editor);
editor.completer.cancelContextMenu();
Expand All @@ -1624,6 +1634,7 @@ var FilteredList = function(array, filterText, mutateData) {
this.all = array;
this.filtered = array;
this.filterText = filterText || "";
this.exactMatch = false;
};
(function(){
this.setFilter = function(str) {
Expand Down Expand Up @@ -1658,20 +1669,26 @@ var FilteredList = function(array, filterText, mutateData) {
var matchMask = 0;
var penalty = 0;
var index, distance;
for (var j = 0; j < needle.length; j++) {
var i1 = caption.indexOf(lower[j], lastIndex + 1);
var i2 = caption.indexOf(upper[j], lastIndex + 1);
index = (i1 >= 0) ? ((i2 < 0 || i1 < i2) ? i1 : i2) : i2;
if (index < 0)

if (this.exactMatch) {
if (needle !== caption.substr(0, needle.length))
continue loop;
distance = index - lastIndex - 1;
if (distance > 0) {
if (lastIndex === -1)
penalty += 10;
penalty += distance;
}else{
for (var j = 0; j < needle.length; j++) {
var i1 = caption.indexOf(lower[j], lastIndex + 1);
var i2 = caption.indexOf(upper[j], lastIndex + 1);
index = (i1 >= 0) ? ((i2 < 0 || i1 < i2) ? i1 : i2) : i2;
if (index < 0)
continue loop;
distance = index - lastIndex - 1;
if (distance > 0) {
if (lastIndex === -1)
penalty += 10;
penalty += distance;
}
matchMask = matchMask | (1 << index);
lastIndex = index;
}
matchMask = matchMask | (1 << index);
lastIndex = index;
}
item.matchMask = matchMask;
item.exactMatch = penalty ? 0 : 1;
Expand Down Expand Up @@ -1839,7 +1856,7 @@ var loadSnippetFile = function(id) {
function getCompletionPrefix(editor) {
var pos = editor.getCursorPosition();
var line = editor.session.getLine(pos.row);
var prefix = util.retrievePrecedingIdentifier(line, pos.column);
var prefix;
editor.completers.forEach(function(completer) {
if (completer.identifierRegexps) {
completer.identifierRegexps.forEach(function(identifierRegex) {
Expand All @@ -1848,7 +1865,7 @@ function getCompletionPrefix(editor) {
});
}
});
return prefix;
return prefix || util.retrievePrecedingIdentifier(line, pos.column);
}

var doLiveAutocomplete = function(e) {
Expand All @@ -1865,7 +1882,6 @@ var doLiveAutocomplete = function(e) {
if (!editor.completer) {
editor.completer = new Autocomplete();
}
editor.completer.autoSelect = false;
editor.completer.autoInsert = false;
editor.completer.showPopup(editor);
}
Expand Down
10 changes: 7 additions & 3 deletions ext/modelist.js
View file
Expand Up @@ -35,10 +35,11 @@ Mode.prototype.supportsFile = function(filename) {
};
var supportedModes = {
ABAP: ["abap"],
ABC: ["abc"],
ActionScript:["as"],
ADA: ["ada|adb"],
Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
AsciiDoc: ["asciidoc"],
AsciiDoc: ["asciidoc|adoc"],
Assembly_x86:["asm"],
AutoHotKey: ["ahk"],
BatchFile: ["bat|cmd"],
Expand Down Expand Up @@ -90,6 +91,7 @@ var supportedModes = {
JSX: ["jsx"],
Julia: ["jl"],
LaTeX: ["tex|latex|ltx|bib"],
Lean: ["lean|hlean"],
LESS: ["less"],
Liquid: ["liquid"],
Lisp: ["lisp"],
Expand All @@ -101,6 +103,7 @@ var supportedModes = {
Lucene: ["lucene"],
Makefile: ["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"],
Markdown: ["md|markdown"],
Mask: ["mask"],
MATLAB: ["matlab"],
MEL: ["mel"],
MUSHCode: ["mc|mush"],
Expand Down Expand Up @@ -149,9 +152,10 @@ var supportedModes = {
Velocity: ["vm"],
Verilog: ["v|vh|sv|svh"],
VHDL: ["vhd|vhdl"],
XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],
XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"],
XQuery: ["xq"],
YAML: ["yaml|yml"]
YAML: ["yaml|yml"],
Django: ["html"]
};

var nameOverrides = {
Expand Down
12 changes: 8 additions & 4 deletions ext/settings_menu.js
View file
Expand Up @@ -91,10 +91,11 @@ Mode.prototype.supportsFile = function(filename) {
};
var supportedModes = {
ABAP: ["abap"],
ABC: ["abc"],
ActionScript:["as"],
ADA: ["ada|adb"],
Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
AsciiDoc: ["asciidoc"],
AsciiDoc: ["asciidoc|adoc"],
Assembly_x86:["asm"],
AutoHotKey: ["ahk"],
BatchFile: ["bat|cmd"],
Expand Down Expand Up @@ -146,6 +147,7 @@ var supportedModes = {
JSX: ["jsx"],
Julia: ["jl"],
LaTeX: ["tex|latex|ltx|bib"],
Lean: ["lean|hlean"],
LESS: ["less"],
Liquid: ["liquid"],
Lisp: ["lisp"],
Expand All @@ -157,6 +159,7 @@ var supportedModes = {
Lucene: ["lucene"],
Makefile: ["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"],
Markdown: ["md|markdown"],
Mask: ["mask"],
MATLAB: ["matlab"],
MEL: ["mel"],
MUSHCode: ["mc|mush"],
Expand Down Expand Up @@ -205,9 +208,10 @@ var supportedModes = {
Velocity: ["vm"],
Verilog: ["v|vh|sv|svh"],
VHDL: ["vhd|vhdl"],
XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],
XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"],
XQuery: ["xq"],
YAML: ["yaml|yml"]
YAML: ["yaml|yml"],
Django: ["html"]
};

var nameOverrides = {
Expand Down Expand Up @@ -410,7 +414,7 @@ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) {
});

var el = topmenu.appendChild(document.createElement('div'));
var version = "1.1.7";
var version = "1.1.9";
el.style.padding = "1em";
el.textContent = "Ace version " + version;

Expand Down
17 changes: 12 additions & 5 deletions ext/static_highlight.js
View file
Expand Up @@ -6,21 +6,27 @@ var TextLayer = acequire("../layer/text").Text;
var baseStyles = ".ace_static_highlight {\
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'Droid Sans Mono', monospace;\
font-size: 12px;\
white-space: pre-wrap\
}\
.ace_static_highlight .ace_gutter {\
width: 25px !important;\
float: left;\
width: 2em;\
text-align: right;\
padding: 0 3px 0 0;\
margin-right: 3px;\
position: static !important;\
}\
.ace_static_highlight .ace_line { clear: both; }\
.ace_static_highlight.ace_show_gutter .ace_line {\
padding-left: 2.6em;\
}\
.ace_static_highlight .ace_line { position: relative; }\
.ace_static_highlight .ace_gutter-cell {\
-moz-user-select: -moz-none;\
-khtml-user-select: none;\
-webkit-user-select: none;\
user-select: none;\
top: 0;\
bottom: 0;\
left: 0;\
position: absolute;\
}\
.ace_static_highlight .ace_gutter-cell:before {\
content: counter(ace_line, decimal);\
Expand Down Expand Up @@ -131,7 +137,8 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
stringBuilder.push("\n</div>");
}
var html = "<div class='" + theme.cssClass + "'>" +
"<div class='ace_static_highlight' style='counter-reset:ace_line " + (lineStart - 1) + "'>" +
"<div class='ace_static_highlight" + (disableGutter ? "" : " ace_show_gutter") +
"' style='counter-reset:ace_line " + (lineStart - 1) + "'>" +
stringBuilder.join("") +
"</div>" +
"</div>";
Expand Down

0 comments on commit 1698c25

Please sign in to comment.