"
- );
- }
+ lineEl = this.$createLineElement();
+ parent.appendChild(lineEl);
- stringBuilder.push(lang.stringRepeat("\xa0", splits.indent));
+ lineEl.appendChild(this.dom.createTextNode(lang.stringRepeat("\xa0", splits.indent), this.element));
split ++;
screenColumn = 0;
@@ -14928,28 +16675,44 @@ var Text = function(parentEl) {
if (value.length != 0) {
chars += value.length;
screenColumn = this.$renderToken(
- stringBuilder, screenColumn, token, value
+ lineEl, screenColumn, token, value
);
}
}
}
+
+ if (splits[splits.length - 1] > this.MAX_LINE_LENGTH)
+ this.$renderOverflowMessage(lineEl, screenColumn, null, "", true);
};
- this.$renderSimpleLine = function(stringBuilder, tokens) {
+ this.$renderSimpleLine = function(parent, tokens) {
var screenColumn = 0;
var token = tokens[0];
var value = token.value;
if (this.displayIndentGuides)
- value = this.renderIndentGuide(stringBuilder, value);
+ value = this.renderIndentGuide(parent, value);
if (value)
- screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value);
+ screenColumn = this.$renderToken(parent, screenColumn, token, value);
for (var i = 1; i < tokens.length; i++) {
token = tokens[i];
value = token.value;
- screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value);
+ if (screenColumn + value.length > this.MAX_LINE_LENGTH)
+ return this.$renderOverflowMessage(parent, screenColumn, token, value);
+ screenColumn = this.$renderToken(parent, screenColumn, token, value);
}
};
- this.$renderLine = function(stringBuilder, row, onlyContents, foldLine) {
+
+ this.$renderOverflowMessage = function(parent, screenColumn, token, value, hide) {
+ token && this.$renderToken(parent, screenColumn, token,
+ value.slice(0, this.MAX_LINE_LENGTH - screenColumn));
+
+ var overflowEl = this.dom.createElement("span");
+ overflowEl.className = "ace_inline_button ace_keyword ace_toggle_wrap";
+ overflowEl.textContent = hide ? "
" : "";
+
+ parent.appendChild(overflowEl);
+ };
+ this.$renderLine = function(parent, row, foldLine) {
if (!foldLine && foldLine != false)
foldLine = this.session.getFoldLine(row);
@@ -14958,36 +16721,35 @@ var Text = function(parentEl) {
else
var tokens = this.session.getTokens(row);
-
- if (!onlyContents) {
- stringBuilder.push(
- ""
- );
- }
-
+ var lastLineEl = parent;
if (tokens.length) {
var splits = this.session.getRowSplitData(row);
- if (splits && splits.length)
- this.$renderWrappedLine(stringBuilder, tokens, splits, onlyContents);
- else
- this.$renderSimpleLine(stringBuilder, tokens);
+ if (splits && splits.length) {
+ this.$renderWrappedLine(parent, tokens, splits);
+ var lastLineEl = parent.lastChild;
+ } else {
+ var lastLineEl = parent;
+ if (this.$useLineGroups()) {
+ lastLineEl = this.$createLineElement();
+ parent.appendChild(lastLineEl);
+ }
+ this.$renderSimpleLine(lastLineEl, tokens);
+ }
+ } else if (this.$useLineGroups()) {
+ lastLineEl = this.$createLineElement();
+ parent.appendChild(lastLineEl);
}
- if (this.showInvisibles) {
+ if (this.showInvisibles && lastLineEl) {
if (foldLine)
- row = foldLine.end.row
+ row = foldLine.end.row;
- stringBuilder.push(
- "",
- row == this.session.getLength() - 1 ? this.EOF_CHAR : this.EOL_CHAR,
- ""
- );
+ var invisibleEl = this.dom.createElement("span");
+ invisibleEl.className = "ace_invisible ace_invisible_eol";
+ invisibleEl.textContent = row == this.session.getLength() - 1 ? this.EOF_CHAR : this.EOL_CHAR;
+
+ lastLineEl.appendChild(invisibleEl);
}
- if (!onlyContents)
- stringBuilder.push("
");
};
this.$getFoldLineTokens = function(row, foldLine) {
@@ -15054,13 +16816,7 @@ var Text = function(parentEl) {
return this.session.getUseWrapMode();
};
- this.destroy = function() {
- clearInterval(this.$pollSizeChangesTimer);
- if (this.$measureNode)
- this.$measureNode.parentNode.removeChild(this.$measureNode);
- delete this.$measureNode;
- };
-
+ this.destroy = function() {};
}).call(Text.prototype);
exports.Text = Text;
@@ -15071,16 +16827,12 @@ define("ace/layer/cursor",["require","exports","module","ace/lib/dom"], function
"use strict";
var dom = require("../lib/dom");
-var isIE8;
var Cursor = function(parentEl) {
this.element = dom.createElement("div");
this.element.className = "ace_layer ace_cursor-layer";
parentEl.appendChild(this.element);
- if (isIE8 === undefined)
- isIE8 = !("opacity" in this.element.style);
-
this.isVisible = false;
this.isBlinking = true;
this.blinkInterval = 1000;
@@ -15089,24 +16841,30 @@ var Cursor = function(parentEl) {
this.cursors = [];
this.cursor = this.addCursor();
dom.addCssClass(this.element, "ace_hidden-cursors");
- this.$updateCursors = (isIE8
- ? this.$updateVisibility
- : this.$updateOpacity).bind(this);
+ this.$updateCursors = this.$updateOpacity.bind(this);
};
(function() {
- this.$updateVisibility = function(val) {
- var cursors = this.cursors;
- for (var i = cursors.length; i--; )
- cursors[i].style.visibility = val ? "" : "hidden";
- };
this.$updateOpacity = function(val) {
var cursors = this.cursors;
for (var i = cursors.length; i--; )
- cursors[i].style.opacity = val ? "" : "0";
+ dom.setStyle(cursors[i].style, "opacity", val ? "" : "0");
+ };
+
+ this.$startCssAnimation = function() {
+ var cursors = this.cursors;
+ for (var i = cursors.length; i--; )
+ cursors[i].style.animationDuration = this.blinkInterval + "ms";
+
+ setTimeout(function() {
+ dom.addCssClass(this.element, "ace_animate-blinking");
+ }.bind(this));
};
+ this.$stopCssAnimation = function() {
+ dom.removeCssClass(this.element, "ace_animate-blinking");
+ };
this.$padding = 0;
this.setPadding = function(padding) {
@@ -15118,25 +16876,24 @@ var Cursor = function(parentEl) {
};
this.setBlinking = function(blinking) {
- if (blinking != this.isBlinking){
+ if (blinking != this.isBlinking) {
this.isBlinking = blinking;
this.restartTimer();
}
};
this.setBlinkInterval = function(blinkInterval) {
- if (blinkInterval != this.blinkInterval){
+ if (blinkInterval != this.blinkInterval) {
this.blinkInterval = blinkInterval;
this.restartTimer();
}
};
this.setSmoothBlinking = function(smoothBlinking) {
- if (smoothBlinking != this.smoothBlinking && !isIE8) {
+ if (smoothBlinking != this.smoothBlinking) {
this.smoothBlinking = smoothBlinking;
dom.setCssClass(this.element, "ace_smooth-blinking", smoothBlinking);
this.$updateCursors(true);
- this.$updateCursors = (this.$updateOpacity).bind(this);
this.restartTimer();
}
};
@@ -15173,14 +16930,18 @@ var Cursor = function(parentEl) {
var update = this.$updateCursors;
clearInterval(this.intervalId);
clearTimeout(this.timeoutId);
+ this.$stopCssAnimation();
+
if (this.smoothBlinking) {
dom.removeCssClass(this.element, "ace_smooth-blinking");
}
update(true);
- if (!this.isBlinking || !this.blinkInterval || !this.isVisible)
+ if (!this.isBlinking || !this.blinkInterval || !this.isVisible) {
+ this.$stopCssAnimation();
return;
+ }
if (this.smoothBlinking) {
setTimeout(function(){
@@ -15188,18 +16949,21 @@ var Cursor = function(parentEl) {
}.bind(this));
}
- var blink = function(){
- this.timeoutId = setTimeout(function() {
- update(false);
- }, 0.6 * this.blinkInterval);
- }.bind(this);
-
- this.intervalId = setInterval(function() {
- update(true);
+ if (dom.HAS_CSS_ANIMATION) {
+ this.$startCssAnimation();
+ } else {
+ var blink = function(){
+ this.timeoutId = setTimeout(function() {
+ update(false);
+ }, 0.6 * this.blinkInterval);
+ }.bind(this);
+
+ this.intervalId = setInterval(function() {
+ update(true);
+ blink();
+ }, this.blinkInterval);
blink();
- }, this.blinkInterval);
-
- blink();
+ }
};
this.getPixelPosition = function(position, onScreen) {
@@ -15209,13 +16973,20 @@ var Cursor = function(parentEl) {
if (!position)
position = this.session.selection.getCursor();
var pos = this.session.documentToScreenPosition(position);
- var cursorLeft = this.$padding + pos.column * this.config.characterWidth;
+ var cursorLeft = this.$padding + (this.session.$bidiHandler.isBidiRow(pos.row, position.row)
+ ? this.session.$bidiHandler.getPosLeft(pos.column)
+ : pos.column * this.config.characterWidth);
+
var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) *
this.config.lineHeight;
return {left : cursorLeft, top : cursorTop};
};
+ this.isCursorInView = function(pixelPos, config) {
+ return pixelPos.top >= 0 && pixelPos.top < config.maxHeight;
+ };
+
this.update = function(config) {
this.config = config;
@@ -15233,15 +17004,20 @@ var Cursor = function(parentEl) {
continue;
}
- var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
+ var element = this.cursors[cursorIndex++] || this.addCursor();
+ var style = element.style;
if (!this.drawCursor) {
- style.left = pixelPos.left + "px";
- style.top = pixelPos.top + "px";
- style.width = config.characterWidth + "px";
- style.height = config.lineHeight + "px";
+ if (!this.isCursorInView(pixelPos, config)) {
+ dom.setStyle(style, "display", "none");
+ } else {
+ dom.setStyle(style, "display", "block");
+ dom.translate(element, pixelPos.left, pixelPos.top);
+ dom.setStyle(style, "width", Math.round(config.characterWidth) + "px");
+ dom.setStyle(style, "height", config.lineHeight + "px");
+ }
} else {
- this.drawCursor(style, pixelPos, config, selections[i], this.session);
+ this.drawCursor(element, pixelPos, config, selections[i], this.session);
}
}
while (this.cursors.length > cursorIndex)
@@ -15290,6 +17066,7 @@ var ScrollBar = function(parent) {
this.inner = dom.createElement("div");
this.inner.className = "ace_scrollbar-inner";
+ this.inner.textContent = "\xa0";
this.element.appendChild(this.inner);
parent.appendChild(this.element);
@@ -15350,7 +17127,7 @@ oop.inherits(VScrollBar, ScrollBar);
this.coeff = MAX_SCROLL_H / height;
height = MAX_SCROLL_H;
} else if (this.coeff != 1) {
- this.coeff = 1
+ this.coeff = 1;
}
this.inner.style.height = height + "px";
};
@@ -15423,42 +17200,61 @@ var RenderLoop = function(onRender, win) {
this.onRender = onRender;
this.pending = false;
this.changes = 0;
+ this.$recursionLimit = 2;
this.window = win || window;
+ var _self = this;
+ this._flush = function(ts) {
+ _self.pending = false;
+ var changes = _self.changes;
+
+ if (changes) {
+ event.blockIdle(100);
+ _self.changes = 0;
+ _self.onRender(changes);
+ }
+
+ if (_self.changes) {
+ if (_self.$recursionLimit-- < 0) return;
+ _self.schedule();
+ } else {
+ _self.$recursionLimit = 2;
+ }
+ };
};
(function() {
-
this.schedule = function(change) {
this.changes = this.changes | change;
- if (!this.pending && this.changes) {
+ if (this.changes && !this.pending) {
+ event.nextFrame(this._flush);
this.pending = true;
- var _self = this;
- event.nextFrame(function() {
- _self.pending = false;
- var changes;
- while (changes = _self.changes) {
- _self.changes = 0;
- _self.onRender(changes);
- }
- }, this.window);
}
};
+ this.clear = function(change) {
+ var changes = this.changes;
+ this.changes = 0;
+ return changes;
+ };
+
}).call(RenderLoop.prototype);
exports.RenderLoop = RenderLoop;
});
-define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"], function(require, exports, module) {
+define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/lib/useragent","ace/lib/event_emitter"], function(require, exports, module) {
var oop = require("../lib/oop");
var dom = require("../lib/dom");
var lang = require("../lib/lang");
+var event = require("../lib/event");
var useragent = require("../lib/useragent");
var EventEmitter = require("../lib/event_emitter").EventEmitter;
-var CHAR_COUNT = 0;
+var CHAR_COUNT = 256;
+var USE_OBSERVER = typeof ResizeObserver == "function";
+var L = 200;
var FontMetrics = exports.FontMetrics = function(parentEl) {
this.el = dom.createElement("div");
@@ -15475,12 +17271,15 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
this.el.appendChild(this.$measureNode);
parentEl.appendChild(this.el);
- if (!CHAR_COUNT)
- this.$testFractionalRect();
this.$measureNode.innerHTML = lang.stringRepeat("X", CHAR_COUNT);
this.$characterSize = {width: 0, height: 0};
- this.checkForSizeChanges();
+
+
+ if (USE_OBSERVER)
+ this.$addObserver();
+ else
+ this.checkForSizeChanges();
};
(function() {
@@ -15489,19 +17288,6 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
this.$characterSize = {width: 0, height: 0};
- this.$testFractionalRect = function() {
- var el = dom.createElement("div");
- this.$setMeasureNodeStyles(el.style);
- el.style.width = "0.2px";
- document.documentElement.appendChild(el);
- var w = el.getBoundingClientRect().width;
- if (w > 0 && w < 1)
- CHAR_COUNT = 50;
- else
- CHAR_COUNT = 100;
- el.parentNode.removeChild(el);
- };
-
this.$setMeasureNodeStyles = function(style, isRoot) {
style.width = style.height = "auto";
style.left = style.top = "0px";
@@ -15517,8 +17303,9 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
style.overflow = isRoot ? "hidden" : "visible";
};
- this.checkForSizeChanges = function() {
- var size = this.$measureSizes();
+ this.checkForSizeChanges = function(size) {
+ if (size === undefined)
+ size = this.$measureSizes();
if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) {
this.$measureNode.style.fontWeight = "bold";
var boldSize = this.$measureSizes();
@@ -15529,13 +17316,27 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
this._emit("changeCharacterSize", {data: size});
}
};
+
+ this.$addObserver = function() {
+ var self = this;
+ this.$observer = new window.ResizeObserver(function(e) {
+ var rect = e[0].contentRect;
+ self.checkForSizeChanges({
+ height: rect.height,
+ width: rect.width / CHAR_COUNT
+ });
+ });
+ this.$observer.observe(this.$measureNode);
+ };
this.$pollSizeChanges = function() {
- if (this.$pollSizeChangesTimer)
+ if (this.$pollSizeChangesTimer || this.$observer)
return this.$pollSizeChangesTimer;
var self = this;
- return this.$pollSizeChangesTimer = setInterval(function() {
+
+ return this.$pollSizeChangesTimer = event.onIdle(function cb() {
self.checkForSizeChanges();
+ event.onIdle(cb, 500);
}, 500);
};
@@ -15548,24 +17349,11 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
}
};
- this.$measureSizes = function() {
- if (CHAR_COUNT === 50) {
- var rect = null;
- try {
- rect = this.$measureNode.getBoundingClientRect();
- } catch(e) {
- rect = {width: 0, height:0 };
- }
- var size = {
- height: rect.height,
- width: rect.width / CHAR_COUNT
- };
- } else {
- var size = {
- height: this.$measureNode.clientHeight,
- width: this.$measureNode.clientWidth / CHAR_COUNT
- };
- }
+ this.$measureSizes = function(node) {
+ var size = {
+ height: (node || this.$measureNode).clientHeight,
+ width: (node || this.$measureNode).clientWidth / CHAR_COUNT
+ };
if (size.width === 0 || size.height === 0)
return null;
return size;
@@ -15587,21 +17375,80 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
this.destroy = function() {
clearInterval(this.$pollSizeChangesTimer);
+ if (this.$observer)
+ this.$observer.disconnect();
if (this.el && this.el.parentNode)
this.el.parentNode.removeChild(this.el);
};
+
+ this.$getZoom = function getZoom(element) {
+ if (!element) return 1;
+ return (window.getComputedStyle(element).zoom || 1) * getZoom(element.parentElement);
+ };
+ this.$initTransformMeasureNodes = function() {
+ var t = function(t, l) {
+ return ["div", {
+ style: "position: absolute;top:" + t + "px;left:" + l + "px;"
+ }];
+ };
+ this.els = dom.buildDom([t(0, 0), t(L, 0), t(0, L), t(L, L)], this.el);
+ };
+ this.transformCoordinates = function(clientPos, elPos) {
+ if (clientPos) {
+ var zoom = this.$getZoom(this.el);
+ clientPos = mul(1 / zoom, clientPos);
+ }
+ function solve(l1, l2, r) {
+ var det = l1[1] * l2[0] - l1[0] * l2[1];
+ return [
+ (-l2[1] * r[0] + l2[0] * r[1]) / det,
+ (+l1[1] * r[0] - l1[0] * r[1]) / det
+ ];
+ }
+ function sub(a, b) { return [a[0] - b[0], a[1] - b[1]]; }
+ function add(a, b) { return [a[0] + b[0], a[1] + b[1]]; }
+ function mul(a, b) { return [a * b[0], a * b[1]]; }
+
+ if (!this.els)
+ this.$initTransformMeasureNodes();
+
+ function p(el) {
+ var r = el.getBoundingClientRect();
+ return [r.left, r.top];
+ }
+
+ var a = p(this.els[0]);
+ var b = p(this.els[1]);
+ var c = p(this.els[2]);
+ var d = p(this.els[3]);
+
+ var h = solve(sub(d, b), sub(d, c), sub(add(b, c), add(d, a)));
+
+ var m1 = mul(1 + h[0], sub(b, a));
+ var m2 = mul(1 + h[1], sub(c, a));
+
+ if (elPos) {
+ var x = elPos;
+ var k = h[0] * x[0] / L + h[1] * x[1] / L + 1;
+ var ut = add(mul(x[0], m1), mul(x[1], m2));
+ return add(mul(1 / k / L, ut), a);
+ }
+ var u = sub(clientPos, a);
+ var f = solve(sub(m1, mul(h[0], u)), sub(m2, mul(h[1], u)), u);
+ return mul(L, f);
+ };
+
}).call(FontMetrics.prototype);
});
-define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/lib/useragent","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter"], function(require, exports, module) {
+define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter","ace/lib/useragent"], function(require, exports, module) {
"use strict";
var oop = require("./lib/oop");
var dom = require("./lib/dom");
var config = require("./config");
-var useragent = require("./lib/useragent");
var GutterLayer = require("./layer/gutter").Gutter;
var MarkerLayer = require("./layer/marker").Marker;
var TextLayer = require("./layer/text").Text;
@@ -15611,7 +17458,23 @@ var VScrollBar = require("./scrollbar").VScrollBar;
var RenderLoop = require("./renderloop").RenderLoop;
var FontMetrics = require("./layer/font_metrics").FontMetrics;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = ".ace_editor {\
+var editorCss = "\
+.ace_br1 {border-top-left-radius : 3px;}\
+.ace_br2 {border-top-right-radius : 3px;}\
+.ace_br3 {border-top-left-radius : 3px; border-top-right-radius: 3px;}\
+.ace_br4 {border-bottom-right-radius: 3px;}\
+.ace_br5 {border-top-left-radius : 3px; border-bottom-right-radius: 3px;}\
+.ace_br6 {border-top-right-radius : 3px; border-bottom-right-radius: 3px;}\
+.ace_br7 {border-top-left-radius : 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px;}\
+.ace_br8 {border-bottom-left-radius : 3px;}\
+.ace_br9 {border-top-left-radius : 3px; border-bottom-left-radius: 3px;}\
+.ace_br10{border-top-right-radius : 3px; border-bottom-left-radius: 3px;}\
+.ace_br11{border-top-left-radius : 3px; border-top-right-radius: 3px; border-bottom-left-radius: 3px;}\
+.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
+.ace_br13{border-top-left-radius : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
+.ace_br14{border-top-right-radius : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
+.ace_br15{border-top-left-radius : 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
+.ace_editor {\
position: relative;\
overflow: hidden;\
font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;\
@@ -15633,10 +17496,9 @@ cursor: text;\
}\
.ace_content {\
position: absolute;\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
min-width: 100%;\
+contain: style size layout;\
}\
.ace_dragging .ace_scroller:before{\
position: absolute;\
@@ -15667,6 +17529,7 @@ z-index: 4;\
-moz-user-select: none;\
-webkit-user-select: none;\
user-select: none;\
+contain: style size layout;\
}\
.ace_gutter-active-line {\
position: absolute;\
@@ -15677,6 +17540,10 @@ right: 0;\
box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;\
}\
.ace_gutter-cell {\
+position: absolute;\
+top: 0;\
+left: 0;\
+right: 0;\
padding-left: 19px;\
padding-right: 6px;\
background-repeat: no-repeat;\
@@ -15698,6 +17565,7 @@ background-position: 2px center;\
background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC\");\
}\
.ace_scrollbar {\
+contain: strict;\
position: absolute;\
right: 0;\
bottom: 0;\
@@ -15739,7 +17607,7 @@ overflow: hidden;\
font: inherit;\
padding: 0 1px;\
margin: 0 -1px;\
-text-indent: -1em;\
+contain: strict;\
-ms-user-select: text;\
-moz-user-select: text;\
-webkit-user-select: text;\
@@ -15747,11 +17615,28 @@ user-select: text;\
white-space: pre!important;\
}\
.ace_text-input.ace_composition {\
-background: inherit;\
+background: transparent;\
color: inherit;\
z-index: 1000;\
opacity: 1;\
-text-indent: 0;\
+}\
+.ace_composition_placeholder { color: transparent }\
+.ace_composition_marker { \
+border-bottom: 1px solid;\
+position: absolute;\
+border-radius: 0;\
+margin-top: 1px;\
+}\
+[ace_nocontext=true] {\
+transform: none!important;\
+filter: none!important;\
+perspective: none!important;\
+clip-path: none!important;\
+mask : none!important;\
+contain: none!important;\
+perspective: none!important;\
+mix-blend-mode: initial!important;\
+z-index: auto;\
}\
.ace_layer {\
z-index: 1;\
@@ -15761,8 +17646,6 @@ word-wrap: normal;\
white-space: pre;\
height: 100%;\
width: 100%;\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
pointer-events: none;\
}\
@@ -15771,9 +17654,33 @@ position: relative;\
width: auto;\
text-align: right;\
pointer-events: auto;\
+height: 1000000px;\
+contain: style size layout;\
}\
.ace_text-layer {\
font: inherit !important;\
+position: absolute;\
+height: 1000000px;\
+width: 1000000px;\
+contain: style size layout;\
+}\
+.ace_text-layer > .ace_line, .ace_text-layer > .ace_line_group {\
+contain: style size layout;\
+position: absolute;\
+top: 0;\
+left: 0;\
+right: 0;\
+}\
+.ace_hidpi .ace_text-layer,\
+.ace_hidpi .ace_gutter-layer,\
+.ace_hidpi .ace_content,\
+.ace_hidpi .ace_gutter {\
+contain: strict;\
+will-change: transform;\
+}\
+.ace_hidpi .ace_text-layer > .ace_line, \
+.ace_hidpi .ace_text-layer > .ace_line_group {\
+contain: strict;\
}\
.ace_cjk {\
display: inline-block;\
@@ -15785,8 +17692,6 @@ z-index: 4;\
.ace_cursor {\
z-index: 4;\
position: absolute;\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
border-left: 2px solid;\
transform: translatez(0);\
@@ -15805,9 +17710,29 @@ border-bottom: 1px solid;\
opacity: 0.2;\
}\
.ace_smooth-blinking .ace_cursor {\
--webkit-transition: opacity 0.18s;\
transition: opacity 0.18s;\
}\
+.ace_animate-blinking .ace_cursor {\
+animation-duration: 1000ms;\
+animation-timing-function: step-end;\
+animation-name: blink-ace-animate;\
+animation-iteration-count: infinite;\
+}\
+.ace_animate-blinking.ace_smooth-blinking .ace_cursor {\
+animation-duration: 1000ms;\
+animation-timing-function: ease-in-out;\
+animation-name: blink-ace-animate-smooth;\
+}\
+@keyframes blink-ace-animate {\
+from, to { opacity: 1; }\
+60% { opacity: 0; }\
+}\
+@keyframes blink-ace-animate-smooth {\
+from, to { opacity: 1; }\
+45% { opacity: 1; }\
+60% { opacity: 0; }\
+85% { opacity: 0; }\
+}\
.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {\
position: absolute;\
z-index: 3;\
@@ -15827,13 +17752,9 @@ z-index: 2;\
.ace_marker-layer .ace_selected-word {\
position: absolute;\
z-index: 4;\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
}\
.ace_line .ace_fold {\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
display: inline-block;\
height: 11px;\
@@ -15859,7 +17780,6 @@ url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRF
}\
.ace_tooltip {\
background-color: #FFF;\
-background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.1));\
background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));\
border: 1px solid gray;\
border-radius: 1px;\
@@ -15869,8 +17789,6 @@ max-width: 100%;\
padding: 3px 4px;\
position: fixed;\
z-index: 999999;\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
cursor: default;\
white-space: pre;\
@@ -15885,8 +17803,6 @@ pointer-events: none;\
padding-right: 13px;\
}\
.ace_fold-widget {\
--moz-box-sizing: border-box;\
--webkit-box-sizing: border-box;\
box-sizing: border-box;\
margin: 0 -12px 0 1px;\
display: none;\
@@ -15934,17 +17850,29 @@ background-color: rgba(255, 255, 255, 0.1);\
.ace_dark .ace_fold-widget:active {\
box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);\
}\
+.ace_inline_button {\
+border: 1px solid lightgray;\
+display: inline-block;\
+margin: -1px 8px;\
+padding: 0 5px;\
+pointer-events: auto;\
+cursor: pointer;\
+}\
+.ace_inline_button:hover {\
+border-color: gray;\
+background: rgba(200,200,200,0.2);\
+display: inline-block;\
+pointer-events: auto;\
+}\
.ace_fold-widget.ace_invalid {\
background-color: #FFB4B4;\
border-color: #DE5555;\
}\
.ace_fade-fold-widgets .ace_fold-widget {\
--webkit-transition: opacity 0.4s ease 0.05s;\
transition: opacity 0.4s ease 0.05s;\
opacity: 0;\
}\
.ace_fade-fold-widgets:hover .ace_fold-widget {\
--webkit-transition: opacity 0.05s ease 0.05s;\
transition: opacity 0.05s ease 0.05s;\
opacity:1;\
}\
@@ -15970,46 +17898,31 @@ background-color: rgba(255, 255, 0,0.2);\
position: absolute;\
z-index: 8;\
}\
-.ace_br1 {border-top-left-radius : 3px;}\
-.ace_br2 {border-top-right-radius : 3px;}\
-.ace_br3 {border-top-left-radius : 3px; border-top-right-radius: 3px;}\
-.ace_br4 {border-bottom-right-radius: 3px;}\
-.ace_br5 {border-top-left-radius : 3px; border-bottom-right-radius: 3px;}\
-.ace_br6 {border-top-right-radius : 3px; border-bottom-right-radius: 3px;}\
-.ace_br7 {border-top-left-radius : 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px;}\
-.ace_br8 {border-bottom-left-radius : 3px;}\
-.ace_br9 {border-top-left-radius : 3px; border-bottom-left-radius: 3px;}\
-.ace_br10{border-top-right-radius : 3px; border-bottom-left-radius: 3px;}\
-.ace_br11{border-top-left-radius : 3px; border-top-right-radius: 3px; border-bottom-left-radius: 3px;}\
-.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
-.ace_br13{border-top-left-radius : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
-.ace_br14{border-top-right-radius : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
-.ace_br15{border-top-left-radius : 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}\
-.ace_text-input-ios {\
-position: absolute !important;\
-top: -100000px !important;\
-left: -100000px !important;\
-}\
";
+var useragent = require("./lib/useragent");
+var HIDE_TEXTAREA = useragent.isIE;
+
dom.importCssString(editorCss, "ace_editor.css");
var VirtualRenderer = function(container, theme) {
var _self = this;
this.container = container || dom.createElement("div");
- this.$keepTextAreaAtCursor = !useragent.isOldIE;
dom.addCssClass(this.container, "ace_editor");
+ if (dom.HI_DPI) dom.addCssClass(this.container, "ace_hidpi");
this.setTheme(theme);
this.$gutter = dom.createElement("div");
this.$gutter.className = "ace_gutter";
this.container.appendChild(this.$gutter);
+ this.$gutter.setAttribute("aria-hidden", true);
this.scroller = dom.createElement("div");
this.scroller.className = "ace_scroller";
+
this.container.appendChild(this.scroller);
this.content = dom.createElement("div");
@@ -16089,6 +18002,17 @@ var VirtualRenderer = function(container, theme) {
v: 0,
h: 0
};
+
+ this.margin = {
+ left: 0,
+ right: 0,
+ top: 0,
+ bottom: 0,
+ v: 0,
+ h: 0
+ };
+
+ this.$keepTextAreaAtCursor = !useragent.isIOS;
this.$loop = new RenderLoop(
this.$renderChanges.bind(this),
@@ -16099,7 +18023,7 @@ var VirtualRenderer = function(container, theme) {
this.updateCharacterSize();
this.setPadding(4);
config.resetOptions(this);
- config._emit("renderer", this);
+ config._signal("renderer", this);
};
(function() {
@@ -16151,7 +18075,7 @@ var VirtualRenderer = function(container, theme) {
this.scrollBarH.scrollLeft = this.scrollBarV.scrollTop = null;
this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this);
- this.onChangeNewLineMode()
+ this.onChangeNewLineMode();
this.session.doc.on("changeNewLineMode", this.onChangeNewLineMode);
};
this.updateLines = function(firstRow, lastRow, force) {
@@ -16185,6 +18109,7 @@ var VirtualRenderer = function(container, theme) {
this.onChangeNewLineMode = function() {
this.$loop.schedule(this.CHANGE_TEXT);
this.$textLayer.$updateEolChar();
+ this.session.$bidiHandler.setEolChar(this.$textLayer.EOL_CHAR);
};
this.onChangeTabSize = function() {
@@ -16273,16 +18198,19 @@ var VirtualRenderer = function(container, theme) {
this.gutterWidth = gutterWidth;
- this.scrollBarH.element.style.left =
- this.scroller.style.left = gutterWidth + "px";
- size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBarV.getWidth());
+ dom.setStyle(this.scrollBarH.element.style, "left", gutterWidth + "px");
+ dom.setStyle(this.scroller.style, "left", gutterWidth + this.margin.left + "px");
+ size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBarV.getWidth() - this.margin.h);
+ dom.setStyle(this.$gutter.style, "left", this.margin.left + "px");
- this.scrollBarH.element.style.right =
- this.scroller.style.right = this.scrollBarV.getWidth() + "px";
- this.scroller.style.bottom = this.scrollBarH.getHeight() + "px";
+ var right = this.scrollBarV.getWidth() + "px";
+ dom.setStyle(this.scrollBarH.element.style, "right", right);
+ dom.setStyle(this.scroller.style, "right", right);
+ dom.setStyle(this.scroller.style, "bottom", this.scrollBarH.getHeight());
- if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
+ if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || force) {
changes |= this.CHANGE_FULL;
+ }
}
size.$dirty = !width || !height;
@@ -16293,8 +18221,8 @@ var VirtualRenderer = function(container, theme) {
return changes;
};
- this.onGutterResize = function() {
- var gutterWidth = this.$showGutter ? this.$gutter.offsetWidth : 0;
+ this.onGutterResize = function(width) {
+ var gutterWidth = this.$showGutter ? width : 0;
if (gutterWidth != this.gutterWidth)
this.$changes |= this.$updateCachedSize(true, gutterWidth, this.$size.width, this.$size.height);
@@ -16304,7 +18232,6 @@ var VirtualRenderer = function(container, theme) {
this.$loop.schedule(this.CHANGE_FULL);
} else {
this.$computeLayerConfig();
- this.$loop.schedule(this.CHANGE_MARKER);
}
};
this.adjustWrapLimit = function() {
@@ -16320,6 +18247,7 @@ var VirtualRenderer = function(container, theme) {
};
this.setShowInvisibles = function(showInvisibles) {
this.setOption("showInvisibles", showInvisibles);
+ this.session.$bidiHandler.setShowInvisibles(showInvisibles);
};
this.getShowInvisibles = function() {
return this.getOption("showInvisibles");
@@ -16351,7 +18279,7 @@ var VirtualRenderer = function(container, theme) {
};
this.getFadeFoldWidgets = function(){
- return this.getOption("fadeFoldWidgets")
+ return this.getOption("fadeFoldWidgets");
};
this.setFadeFoldWidgets = function(show) {
@@ -16366,19 +18294,6 @@ var VirtualRenderer = function(container, theme) {
return this.getOption("highlightGutterLine");
};
- this.$updateGutterLineHighlight = function() {
- var pos = this.$cursorLayer.$pixelPos;
- var height = this.layerConfig.lineHeight;
- if (this.session.getUseWrapMode()) {
- var cursor = this.session.selection.getCursor();
- cursor.column = 0;
- pos = this.$cursorLayer.getPixelPosition(cursor, true);
- height *= this.session.getRowLength(cursor.row);
- }
- this.$gutterLineHighlight.style.top = pos.top - this.layerConfig.offset + "px";
- this.$gutterLineHighlight.style.height = height + "px";
- };
-
this.$updatePrintMargin = function() {
if (!this.$showPrintMargin && !this.$printMarginEl)
return;
@@ -16393,7 +18308,7 @@ var VirtualRenderer = function(container, theme) {
}
var style = this.$printMarginEl.style;
- style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding) + "px";
+ style.left = Math.round(this.characterWidth * this.$printMarginColumn + this.$padding) + "px";
style.visibility = this.$showPrintMargin ? "visible" : "hidden";
if (this.session && this.session.$wrap == -1)
@@ -16409,35 +18324,54 @@ var VirtualRenderer = function(container, theme) {
return this.container;
};
this.$moveTextAreaToCursor = function() {
- if (!this.$keepTextAreaAtCursor)
+ if (this.$isMousePressed) return;
+ var style = this.textarea.style;
+ var composition = this.$composition;
+ if (!this.$keepTextAreaAtCursor && !composition) {
+ dom.translate(this.textarea, -100, 0);
return;
+ }
+ var pixelPos = this.$cursorLayer.$pixelPos;
+ if (!pixelPos)
+ return;
+ if (composition && composition.markerRange)
+ pixelPos = this.$cursorLayer.getPixelPosition(composition.markerRange.start, true);
+
var config = this.layerConfig;
- var posTop = this.$cursorLayer.$pixelPos.top;
- var posLeft = this.$cursorLayer.$pixelPos.left;
+ var posTop = pixelPos.top;
+ var posLeft = pixelPos.left;
posTop -= config.offset;
- var style = this.textarea.style;
- var h = this.lineHeight;
+ var h = composition && composition.useTextareaForIME ? this.lineHeight : HIDE_TEXTAREA ? 0 : 1;
if (posTop < 0 || posTop > config.height - h) {
- style.top = style.left = "0";
+ dom.translate(this.textarea, 0, 0);
return;
}
- var w = this.characterWidth;
- if (this.$composition) {
- var val = this.textarea.value.replace(/^\x01+/, "");
- w *= (this.session.$getStringScreenWidth(val)[0]+2);
- h += 2;
+ var w = 1;
+ if (!composition) {
+ posTop += this.lineHeight;
}
+ else {
+ if (composition.useTextareaForIME) {
+ var val = this.textarea.value;
+ w = this.characterWidth * (this.session.$getStringScreenWidth(val)[0]);
+ h += 2;
+ }
+ else {
+ posTop += this.lineHeight + 2;
+ }
+ }
+
posLeft -= this.scrollLeft;
if (posLeft > this.$size.scrollerWidth - w)
posLeft = this.$size.scrollerWidth - w;
- posLeft += this.gutterWidth;
- style.height = h + "px";
- style.width = w + "px";
- style.left = Math.min(posLeft, this.$size.scrollerWidth - w) + "px";
- style.top = Math.min(posTop, this.$size.height - h) + "px";
+ posLeft += this.gutterWidth + this.margin.left;
+
+ dom.setStyle(style, "height", h + "px");
+ dom.setStyle(style, "width", w + "px");
+ dom.translate(this.textarea, Math.min(posLeft, this.$size.scrollerWidth - w), Math.min(posTop, this.$size.height - h));
};
this.getFirstVisibleRow = function() {
return this.layerConfig.firstRow;
@@ -16447,7 +18381,7 @@ var VirtualRenderer = function(container, theme) {
};
this.getLastFullyVisibleRow = function() {
var config = this.layerConfig;
- var lastRow = config.lastRow
+ var lastRow = config.lastRow;
var top = this.session.documentToScreenRow(lastRow, 0) * config.lineHeight;
if (top - this.session.getScrollTop() > config.height - config.lineHeight)
return lastRow - 1;
@@ -16480,6 +18414,18 @@ var VirtualRenderer = function(container, theme) {
this.session.setScrollTop(-sm.top);
this.updateFull();
};
+
+ this.setMargin = function(top, bottom, left, right) {
+ var sm = this.margin;
+ sm.top = top|0;
+ sm.bottom = bottom|0;
+ sm.right = right|0;
+ sm.left = left|0;
+ sm.v = sm.top + sm.bottom;
+ sm.h = sm.left + sm.right;
+ this.$updateCachedSize(true, this.gutterWidth, this.$size.width, this.$size.height);
+ this.updateFull();
+ };
this.getHScrollBarAlwaysVisible = function() {
return this.$hScrollBarAlwaysVisible;
};
@@ -16538,6 +18484,10 @@ var VirtualRenderer = function(container, theme) {
}
this._signal("beforeRender");
+
+ if (this.session && this.session.$bidiHandler)
+ this.session.$bidiHandler.updateCharacterWidths(this.$fontMetrics);
+
var config = this.layerConfig;
if (changes & this.CHANGE_FULL ||
changes & this.CHANGE_SIZE ||
@@ -16546,26 +18496,30 @@ var VirtualRenderer = function(container, theme) {
changes & this.CHANGE_SCROLL ||
changes & this.CHANGE_H_SCROLL
) {
- changes |= this.$computeLayerConfig();
+ changes |= this.$computeLayerConfig() | this.$loop.clear();
if (config.firstRow != this.layerConfig.firstRow && config.firstRowScreen == this.layerConfig.firstRowScreen) {
var st = this.scrollTop + (config.firstRow - this.layerConfig.firstRow) * this.lineHeight;
if (st > 0) {
this.scrollTop = st;
changes = changes | this.CHANGE_SCROLL;
- changes |= this.$computeLayerConfig();
+ changes |= this.$computeLayerConfig() | this.$loop.clear();
}
}
config = this.layerConfig;
this.$updateScrollBarV();
if (changes & this.CHANGE_H_SCROLL)
this.$updateScrollBarH();
- this.$gutterLayer.element.style.marginTop = (-config.offset) + "px";
- this.content.style.marginTop = (-config.offset) + "px";
- this.content.style.width = config.width + 2 * this.$padding + "px";
- this.content.style.height = config.minHeight + "px";
+
+ dom.translate(this.content, -this.scrollLeft, -config.offset);
+
+ var width = config.width + 2 * this.$padding + "px";
+ var height = config.minHeight + "px";
+
+ dom.setStyle(this.content.style, "width", width);
+ dom.setStyle(this.content.style, "height", height);
}
if (changes & this.CHANGE_H_SCROLL) {
- this.content.style.marginLeft = -this.scrollLeft + "px";
+ dom.translate(this.content, -this.scrollLeft, -config.offset);
this.scroller.className = this.scrollLeft <= 0 ? "ace_scroller" : "ace_scroller ace_scroll-left";
}
if (changes & this.CHANGE_FULL) {
@@ -16576,7 +18530,6 @@ var VirtualRenderer = function(container, theme) {
this.$markerFront.update(config);
this.$cursorLayer.update(config);
this.$moveTextAreaToCursor();
- this.$highlightGutterLine && this.$updateGutterLineHighlight();
this._signal("afterRender");
return;
}
@@ -16586,12 +18539,15 @@ var VirtualRenderer = function(container, theme) {
else
this.$textLayer.scrollLines(config);
- if (this.$showGutter)
- this.$gutterLayer.update(config);
+ if (this.$showGutter) {
+ if (changes & this.CHANGE_GUTTER || changes & this.CHANGE_LINES)
+ this.$gutterLayer.update(config);
+ else
+ this.$gutterLayer.scrollLines(config);
+ }
this.$markerBack.update(config);
this.$markerFront.update(config);
this.$cursorLayer.update(config);
- this.$highlightGutterLine && this.$updateGutterLineHighlight();
this.$moveTextAreaToCursor();
this._signal("afterRender");
return;
@@ -16610,11 +18566,14 @@ var VirtualRenderer = function(container, theme) {
if (this.$showGutter)
this.$gutterLayer.update(config);
}
+ else if (changes & this.CHANGE_CURSOR) {
+ if (this.$highlightGutterLine)
+ this.$gutterLayer.updateLineHighlight(config);
+ }
if (changes & this.CHANGE_CURSOR) {
this.$cursorLayer.update(config);
this.$moveTextAreaToCursor();
- this.$highlightGutterLine && this.$updateGutterLineHighlight();
}
if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
@@ -16639,7 +18598,9 @@ var VirtualRenderer = function(container, theme) {
desiredHeight += this.scrollBarH.getHeight();
if (this.$maxPixelHeight && desiredHeight > this.$maxPixelHeight)
desiredHeight = this.$maxPixelHeight;
- var vScroll = height > maxHeight;
+
+ var hideScrollbars = desiredHeight <= 2 * this.lineHeight;
+ var vScroll = !hideScrollbars && height > maxHeight;
if (desiredHeight != this.desiredHeight ||
this.$size.height != this.desiredHeight || vScroll != this.$vScroll) {
@@ -16679,7 +18640,6 @@ var VirtualRenderer = function(container, theme) {
if (this.$maxLines && this.lineHeight > 1)
this.$autosize();
- var offset = this.scrollTop % this.lineHeight;
var minHeight = size.scrollerHeight + this.lineHeight;
var scrollPastEnd = !this.$maxLines && this.$scrollPastEnd
@@ -16702,6 +18662,7 @@ var VirtualRenderer = function(container, theme) {
this.scrollBarV.setVisible(vScroll);
}
+ var offset = this.scrollTop % this.lineHeight;
var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
var lastRow = firstRow + lineCount;
@@ -16723,10 +18684,10 @@ var VirtualRenderer = function(container, theme) {
offset = this.scrollTop - firstRowScreen * lineHeight;
var changes = 0;
- if (this.layerConfig.width != longestLine)
+ if (this.layerConfig.width != longestLine || hScrollChanged)
changes = this.CHANGE_H_SCROLL;
if (hScrollChanged || vScrollChanged) {
- changes = this.$updateCachedSize(true, this.gutterWidth, size.width, size.height);
+ changes |= this.$updateCachedSize(true, this.gutterWidth, size.width, size.height);
this._signal("scrollbarVisibilityChanged");
if (vScrollChanged)
longestLine = this.$getLongestLine();
@@ -16747,6 +18708,9 @@ var VirtualRenderer = function(container, theme) {
height : this.$size.scrollerHeight
};
+ if (this.session.$bidiHandler)
+ this.session.$bidiHandler.setContentWidth(longestLine - this.$padding);
+
return changes;
};
@@ -16774,6 +18738,9 @@ var VirtualRenderer = function(container, theme) {
var charCount = this.session.getScreenWidth();
if (this.showInvisibles && !this.session.$useWrapMode)
charCount += 1;
+
+ if (this.$textLayer && charCount > this.$textLayer.MAX_LINE_LENGTH)
+ charCount = this.$textLayer.MAX_LINE_LENGTH + 30;
return Math.max(this.$size.scrollerWidth - 2 * this.$padding, Math.round(charCount * this.characterWidth));
};
@@ -16835,7 +18802,7 @@ var VirtualRenderer = function(container, theme) {
} else if (scrollTop + this.$size.scrollerHeight - bottomMargin < top + this.lineHeight) {
if (offset && scrollTop + this.$size.scrollerHeight - bottomMargin < top - this.lineHeight)
top += offset * this.$size.scrollerHeight;
- this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight);
+ this.session.setScrollTop(top + this.lineHeight + bottomMargin - this.$size.scrollerHeight);
}
var scrollLeft = this.scrollLeft;
@@ -16978,31 +18945,51 @@ var VirtualRenderer = function(container, theme) {
};
this.pixelToScreenCoordinates = function(x, y) {
- var canvasPos = this.scroller.getBoundingClientRect();
-
- var offset = (x + this.scrollLeft - canvasPos.left - this.$padding) / this.characterWidth;
+ var canvasPos;
+ if (this.$hasCssTransforms) {
+ canvasPos = {top:0, left: 0};
+ var p = this.$fontMetrics.transformCoordinates([x, y]);
+ x = p[1] - this.gutterWidth - this.margin.left;
+ y = p[0];
+ } else {
+ canvasPos = this.scroller.getBoundingClientRect();
+ }
+
+ var offsetX = x + this.scrollLeft - canvasPos.left - this.$padding;
+ var offset = offsetX / this.characterWidth;
var row = Math.floor((y + this.scrollTop - canvasPos.top) / this.lineHeight);
- var col = Math.round(offset);
+ var col = this.$blockCursor ? Math.floor(offset) : Math.round(offset);
- return {row: row, column: col, side: offset - col > 0 ? 1 : -1};
+ return {row: row, column: col, side: offset - col > 0 ? 1 : -1, offsetX: offsetX};
};
this.screenToTextCoordinates = function(x, y) {
- var canvasPos = this.scroller.getBoundingClientRect();
+ var canvasPos;
+ if (this.$hasCssTransforms) {
+ canvasPos = {top:0, left: 0};
+ var p = this.$fontMetrics.transformCoordinates([x, y]);
+ x = p[1] - this.gutterWidth - this.margin.left;
+ y = p[0];
+ } else {
+ canvasPos = this.scroller.getBoundingClientRect();
+ }
- var col = Math.round(
- (x + this.scrollLeft - canvasPos.left - this.$padding) / this.characterWidth
- );
+ var offsetX = x + this.scrollLeft - canvasPos.left - this.$padding;
+ var offset = offsetX / this.characterWidth;
+ var col = this.$blockCursor ? Math.floor(offset) : Math.round(offset);
- var row = (y + this.scrollTop - canvasPos.top) / this.lineHeight;
+ var row = Math.floor((y + this.scrollTop - canvasPos.top) / this.lineHeight);
- return this.session.screenToDocumentPosition(row, Math.max(col, 0));
+ return this.session.screenToDocumentPosition(row, Math.max(col, 0), offsetX);
};
this.textToScreenCoordinates = function(row, column) {
var canvasPos = this.scroller.getBoundingClientRect();
var pos = this.session.documentToScreenPosition(row, column);
- var x = this.$padding + Math.round(pos.column * this.characterWidth);
+ var x = this.$padding + (this.session.$bidiHandler.isBidiRow(pos.row, row)
+ ? this.session.$bidiHandler.getPosLeft(pos.column)
+ : Math.round(pos.column * this.characterWidth));
+
var y = pos.row * this.lineHeight;
return {
@@ -17016,29 +19003,64 @@ var VirtualRenderer = function(container, theme) {
this.visualizeBlur = function() {
dom.removeCssClass(this.container, "ace_focus");
};
- this.showComposition = function(position) {
- if (!this.$composition)
- this.$composition = {
- keepTextAreaAtCursor: this.$keepTextAreaAtCursor,
- cssText: this.textarea.style.cssText
- };
-
- this.$keepTextAreaAtCursor = true;
- dom.addCssClass(this.textarea, "ace_composition");
- this.textarea.style.cssText = "";
- this.$moveTextAreaToCursor();
+ this.showComposition = function(composition) {
+ this.$composition = composition;
+ if (!composition.cssText) {
+ composition.cssText = this.textarea.style.cssText;
+ }
+ composition.useTextareaForIME = this.$useTextareaForIME;
+
+ if (this.$useTextareaForIME) {
+ dom.addCssClass(this.textarea, "ace_composition");
+ this.textarea.style.cssText = "";
+ this.$moveTextAreaToCursor();
+ this.$cursorLayer.element.style.display = "none";
+ }
+ else {
+ composition.markerId = this.session.addMarker(composition.markerRange, "ace_composition_marker", "text");
+ }
};
this.setCompositionText = function(text) {
+ var cursor = this.session.selection.cursor;
+ this.addToken(text, "composition_placeholder", cursor.row, cursor.column);
this.$moveTextAreaToCursor();
};
this.hideComposition = function() {
if (!this.$composition)
return;
+
+ if (this.$composition.markerId)
+ this.session.removeMarker(this.$composition.markerId);
dom.removeCssClass(this.textarea, "ace_composition");
- this.$keepTextAreaAtCursor = this.$composition.keepTextAreaAtCursor;
this.textarea.style.cssText = this.$composition.cssText;
this.$composition = null;
+ this.$cursorLayer.element.style.display = "";
+ };
+
+ this.addToken = function(text, type, row, column) {
+ var session = this.session;
+ session.bgTokenizer.lines[row] = null;
+ var newToken = {type: type, value: text};
+ var tokens = session.getTokens(row);
+ if (column == null) {
+ tokens.push(newToken);
+ } else {
+ var l = 0;
+ for (var i =0; i < tokens.length; i++) {
+ var token = tokens[i];
+ l += token.value.length;
+ if (column <= l) {
+ var diff = token.value.length - (l - column);
+ var before = token.value.slice(0, diff);
+ var after = token.value.slice(diff);
+
+ tokens.splice(i, 1, {type: token.type, value: before}, newToken, {type: token.type, value: after});
+ break;
+ }
+ }
+ }
+ this.updateLines(row, row);
};
this.setTheme = function(theme, cb) {
var _self = this;
@@ -17057,10 +19079,12 @@ var VirtualRenderer = function(container, theme) {
return cb && cb();
if (!module || !module.cssClass)
throw new Error("couldn't load module " + theme + " or it didn't call define");
+ if (module.$id)
+ _self.$themeId = module.$id;
dom.importCssString(
module.cssText,
module.cssClass,
- _self.container.ownerDocument
+ _self.container
);
if (_self.theme)
@@ -17095,14 +19119,17 @@ var VirtualRenderer = function(container, theme) {
};
this.setCursorStyle = function(style) {
- if (this.scroller.style.cursor != style)
- this.scroller.style.cursor = style;
+ dom.setStyle(this.scroller.style, "cursor", style);
};
this.setMouseCursor = function(cursorStyle) {
- this.scroller.style.cursor = cursorStyle;
+ dom.setStyle(this.scroller.style, "cursor", cursorStyle);
+ };
+
+ this.attachToShadowRoot = function() {
+ dom.importCssString(editorCss, "ace_editor.css", this.container);
};
this.destroy = function() {
- this.$textLayer.destroy();
+ this.$fontMetrics.destroy();
this.$cursorLayer.destroy();
};
@@ -17152,12 +19179,8 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
initialValue: false
},
showFoldWidgets: {
- set: function(show) {this.$gutterLayer.setShowFoldWidgets(show)},
- initialValue: true
- },
- showLineNumbers: {
set: function(show) {
- this.$gutterLayer.setShowLineNumbers(show);
+ this.$gutterLayer.setShowFoldWidgets(show);
this.$loop.schedule(this.CHANGE_GUTTER);
},
initialValue: true
@@ -17171,19 +19194,10 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
},
highlightGutterLine: {
set: function(shouldHighlight) {
- if (!this.$gutterLineHighlight) {
- this.$gutterLineHighlight = dom.createElement("div");
- this.$gutterLineHighlight.className = "ace_gutter-active-line";
- this.$gutter.appendChild(this.$gutterLineHighlight);
- return;
- }
-
- this.$gutterLineHighlight.style.display = shouldHighlight ? "" : "none";
- if (this.$cursorLayer.$pixelPos)
- this.$updateGutterLineHighlight();
+ this.$gutterLayer.setHighlightGutterLine(shouldHighlight);
+ this.$loop.schedule(this.CHANGE_GUTTER);
},
- initialValue: false,
- value: true
+ initialValue: true
},
hScrollBarAlwaysVisible: {
set: function(val) {
@@ -17199,7 +19213,7 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
},
initialValue: false
},
- fontSize: {
+ fontSize: {
set: function(size) {
if (typeof size == "number")
size = size + "px";
@@ -17221,6 +19235,8 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
},
minLines: {
set: function(val) {
+ if (!(this.$minLines < 0x1ffffffffffff))
+ this.$minLines = 0;
this.updateFull();
}
},
@@ -17248,10 +19264,15 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
}
},
theme: {
- set: function(val) { this.setTheme(val) },
+ set: function(val) { this.setTheme(val); },
get: function() { return this.$themeId || this.theme; },
initialValue: "./theme/textmate",
handlesSet: true
+ },
+ hasCssTransforms: {
+ },
+ useTextareaForIME: {
+ initialValue: !useragent.isMobile && !useragent.isIE
}
});
@@ -17279,41 +19300,25 @@ function $workerBlob(workerUrl) {
}
function createWorker(workerUrl) {
- var blob = $workerBlob(workerUrl);
- var URL = window.URL || window.webkitURL;
- var blobURL = URL.createObjectURL(blob);
- return new Worker(blobURL);
+ if (typeof Worker == "undefined")
+ return { postMessage: function() {}, terminate: function() {} };
+ if (config.get("loadWorkerFromBlob")) {
+ var blob = $workerBlob(workerUrl);
+ var URL = window.URL || window.webkitURL;
+ var blobURL = URL.createObjectURL(blob);
+ return new Worker(blobURL);
+ }
+ return new Worker(workerUrl);
}
-var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl, importScripts) {
+var WorkerClient = function(worker) {
+ if (!worker.postMessage)
+ worker = this.$createWorkerFromOldConfig.apply(this, arguments);
+
+ this.$worker = worker;
this.$sendDeltaQueue = this.$sendDeltaQueue.bind(this);
this.changeListener = this.changeListener.bind(this);
this.onMessage = this.onMessage.bind(this);
- if (require.nameToUrl && !require.toUrl)
- require.toUrl = require.nameToUrl;
-
- if (config.get("packaged") || !require.toUrl) {
- workerUrl = workerUrl || config.moduleUrl(mod, "worker");
- } else {
- var normalizePath = this.$normalizePath;
- workerUrl = workerUrl || normalizePath(require.toUrl("ace/worker/worker.js", null, "_"));
-
- var tlns = {};
- topLevelNamespaces.forEach(function(ns) {
- tlns[ns] = normalizePath(require.toUrl(ns, null, "_").replace(/(\.js)?(\?.*)?$/, ""));
- });
- }
-
- this.$worker = createWorker(workerUrl);
- if (importScripts) {
- this.send("importScripts", importScripts);
- }
- this.$worker.postMessage({
- init : true,
- tlns : tlns,
- module : mod,
- classname : classname
- });
this.callbackId = 1;
this.callbacks = {};
@@ -17325,6 +19330,35 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl, impor
oop.implement(this, EventEmitter);
+ this.$createWorkerFromOldConfig = function(topLevelNamespaces, mod, classname, workerUrl, importScripts) {
+ if (require.nameToUrl && !require.toUrl)
+ require.toUrl = require.nameToUrl;
+
+ if (config.get("packaged") || !require.toUrl) {
+ workerUrl = workerUrl || config.moduleUrl(mod, "worker");
+ } else {
+ var normalizePath = this.$normalizePath;
+ workerUrl = workerUrl || normalizePath(require.toUrl("ace/worker/worker.js", null, "_"));
+
+ var tlns = {};
+ topLevelNamespaces.forEach(function(ns) {
+ tlns[ns] = normalizePath(require.toUrl(ns, null, "_").replace(/(\.js)?(\?.*)?$/, ""));
+ });
+ }
+
+ this.$worker = createWorker(workerUrl);
+ if (importScripts) {
+ this.send("importScripts", importScripts);
+ }
+ this.$worker.postMessage({
+ init : true,
+ tlns : tlns,
+ module : mod,
+ classname : classname
+ });
+ return this.$worker;
+ };
+
this.onMessage = function(e) {
var msg = e.data;
switch (msg.type) {
@@ -17380,6 +19414,8 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl, impor
this.emit = function(event, data) {
try {
+ if (data.data && data.data.err)
+ data.data.err = {message: data.data.err.message, stack: data.data.err.stack, code: data.data.err.code};
this.$worker.postMessage({event: event, data: {data: data.data}});
}
catch(ex) {
@@ -17421,32 +19457,28 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl, impor
var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
- this.$sendDeltaQueue = this.$sendDeltaQueue.bind(this);
- this.changeListener = this.changeListener.bind(this);
- this.callbackId = 1;
- this.callbacks = {};
- this.messageBuffer = [];
-
var main = null;
var emitSync = false;
var sender = Object.create(EventEmitter);
- var _self = this;
- this.$worker = {};
- this.$worker.terminate = function() {};
- this.$worker.postMessage = function(e) {
- _self.messageBuffer.push(e);
- if (main) {
+ var messageBuffer = [];
+ var workerClient = new WorkerClient({
+ messageBuffer: messageBuffer,
+ terminate: function() {},
+ postMessage: function(e) {
+ messageBuffer.push(e);
+ if (!main) return;
if (emitSync)
setTimeout(processNext);
else
processNext();
}
- };
- this.setEmitSync = function(val) { emitSync = val };
+ });
+
+ workerClient.setEmitSync = function(val) { emitSync = val; };
var processNext = function() {
- var msg = _self.messageBuffer.shift();
+ var msg = messageBuffer.shift();
if (msg.command)
main[msg.command].apply(main, msg.args);
else if (msg.event)
@@ -17454,7 +19486,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
};
sender.postMessage = function(msg) {
- _self.onMessage({data: msg});
+ workerClient.onMessage({data: msg});
};
sender.callback = function(data, callbackId) {
this.postMessage({type: "call", id: callbackId, data: data});
@@ -17465,12 +19497,12 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
config.loadModule(["worker", mod], function(Main) {
main = new Main[classname](sender);
- while (_self.messageBuffer.length)
+ while (messageBuffer.length)
processNext();
});
-};
-UIWorkerClient.prototype = WorkerClient.prototype;
+ return workerClient;
+};
exports.UIWorkerClient = UIWorkerClient;
exports.WorkerClient = WorkerClient;
@@ -17636,7 +19668,7 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
var undoManager = this.session.getUndoManager();
var undosRequired = (undoManager.$undoStack || undoManager.$undostack).length - this.$undoStackDepth;
for (var i = 0; i < undosRequired; i++) {
- undoManager.undo(true);
+ undoManager.undo(this.session, true);
}
if (this.selectionBefore)
this.session.selection.fromJSON(this.selectionBefore);
@@ -17728,8 +19760,6 @@ function onMouseDown(e) {
var oldRange = selection.rangeList.rangeAtPoint(pos);
-
- editor.$blockScrolling++;
editor.inVirtualSelectionMode = true;
if (shift) {
@@ -17751,7 +19781,6 @@ function onMouseDown(e) {
}
selection.addRange(tmpSel);
}
- editor.$blockScrolling--;
editor.inVirtualSelectionMode = false;
});
@@ -17762,13 +19791,12 @@ function onMouseDown(e) {
var rectSel = [];
var blockSelect = function() {
var newCursor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
- var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column);
+ var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column, newCursor.offsetX);
if (isSamePoint(screenCursor, newCursor) && isSamePoint(cursor, selection.lead))
return;
screenCursor = newCursor;
- editor.$blockScrolling++;
editor.selection.moveToPosition(cursor);
editor.renderer.scrollCursorIntoView();
@@ -17778,9 +19806,7 @@ function onMouseDown(e) {
rectSel[0] = editor.$mouseHandler.$clickSelection.clone();
rectSel.forEach(editor.addSelectionMarker, editor);
editor.updateSelectionMarkers();
- editor.$blockScrolling--;
};
- editor.$blockScrolling++;
if (isMultiSelect && !accel) {
selection.toSingleRange();
} else if (!isMultiSelect && accel) {
@@ -17792,16 +19818,15 @@ function onMouseDown(e) {
screenAnchor = session.documentToScreenPosition(selection.lead);
else
selection.moveToPosition(pos);
- editor.$blockScrolling--;
screenCursor = {row: -1, column: -1};
var onMouseSelectionEnd = function(e) {
+ blockSelect();
clearInterval(timerId);
editor.removeSelectionMarkers(rectSel);
if (!rectSel.length)
rectSel = [selection.toOrientedRange()];
- editor.$blockScrolling++;
if (initialRange) {
editor.removeSelectionMarker(initialRange);
selection.toSingleRange(initialRange);
@@ -17810,7 +19835,6 @@ function onMouseDown(e) {
selection.addRange(rectSel[i]);
editor.inVirtualSelectionMode = false;
editor.$mouseHandler.$clickSelection = null;
- editor.$blockScrolling--;
};
var onSelectionInterval = blockSelect;
@@ -17830,64 +19854,75 @@ exports.onMouseDown = onMouseDown;
define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"], function(require, exports, module) {
exports.defaultCommands = [{
name: "addCursorAbove",
+ description: "Add cursor above",
exec: function(editor) { editor.selectMoreLines(-1); },
bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "addCursorBelow",
+ description: "Add cursor below",
exec: function(editor) { editor.selectMoreLines(1); },
bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "addCursorAboveSkipCurrent",
+ description: "Add cursor above (skip current)",
exec: function(editor) { editor.selectMoreLines(-1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "addCursorBelowSkipCurrent",
+ description: "Add cursor below (skip current)",
exec: function(editor) { editor.selectMoreLines(1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectMoreBefore",
+ description: "Select more before",
exec: function(editor) { editor.selectMore(-1); },
bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectMoreAfter",
+ description: "Select more after",
exec: function(editor) { editor.selectMore(1); },
bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectNextBefore",
+ description: "Select next before",
exec: function(editor) { editor.selectMore(-1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectNextAfter",
+ description: "Select next after",
exec: function(editor) { editor.selectMore(1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"},
scrollIntoView: "cursor",
readOnly: true
}, {
name: "splitIntoLines",
+ description: "Split into lines",
exec: function(editor) { editor.multiSelect.splitIntoLines(); },
bindKey: {win: "Ctrl-Alt-L", mac: "Ctrl-Alt-L"},
readOnly: true
}, {
name: "alignCursors",
+ description: "Align cursors",
exec: function(editor) { editor.alignCursors(); },
bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"},
scrollIntoView: "cursor"
}, {
name: "findAll",
+ description: "Find all",
exec: function(editor) { editor.findAll(); },
bindKey: {win: "Ctrl-Alt-K", mac: "Ctrl-Alt-G"},
scrollIntoView: "cursor",
@@ -17895,11 +19930,12 @@ exports.defaultCommands = [{
}];
exports.multiSelectCommands = [{
name: "singleSelection",
+ description: "Single selection",
bindKey: "esc",
exec: function(editor) { editor.exitMultiSelectMode(); },
scrollIntoView: "cursor",
readOnly: true,
- isAvailable: function(editor) {return editor && editor.inMultiSelectMode}
+ isAvailable: function(editor) {return editor && editor.inMultiSelectMode;}
}];
var HashHandler = require("../keyboard/hash_handler").HashHandler;
@@ -17991,8 +20027,6 @@ var EditSession = require("./edit_session").EditSession;
var removed = this.rangeList.merge();
if (removed.length)
this.$onRemoveRange(removed);
- else if(this.ranges[0])
- this.fromOrientedRange(this.ranges[0]);
};
this.$onAddRange = function(range) {
@@ -18087,8 +20121,8 @@ var EditSession = require("./edit_session").EditSession;
this.toSingleRange();
this.setSelectionRange(range, lastRange.cursor == lastRange.start);
} else {
- var cursor = this.session.documentToScreenPosition(this.selectionLead);
- var anchor = this.session.documentToScreenPosition(this.selectionAnchor);
+ var cursor = this.session.documentToScreenPosition(this.cursor);
+ var anchor = this.session.documentToScreenPosition(this.anchor);
var rectSel = this.rectangularRangeBlock(cursor, anchor);
rectSel.forEach(this.addRange, this);
@@ -18101,9 +20135,13 @@ var EditSession = require("./edit_session").EditSession;
if (xBackwards) {
var startColumn = screenCursor.column;
var endColumn = screenAnchor.column;
+ var startOffsetX = screenCursor.offsetX;
+ var endOffsetX = screenAnchor.offsetX;
} else {
var startColumn = screenAnchor.column;
var endColumn = screenCursor.column;
+ var startOffsetX = screenAnchor.offsetX;
+ var endOffsetX = screenCursor.offsetX;
}
var yBackwards = screenCursor.row < screenAnchor.row;
@@ -18123,15 +20161,16 @@ var EditSession = require("./edit_session").EditSession;
if (startRow == endRow)
includeEmptyLines = true;
+ var docEnd;
for (var row = startRow; row <= endRow; row++) {
var range = Range.fromPoints(
- this.session.screenToDocumentPosition(row, startColumn),
- this.session.screenToDocumentPosition(row, endColumn)
+ this.session.screenToDocumentPosition(row, startColumn, startOffsetX),
+ this.session.screenToDocumentPosition(row, endColumn, endOffsetX)
);
if (range.isEmpty()) {
if (docEnd && isSamePoint(range.end, docEnd))
break;
- var docEnd = range.end;
+ docEnd = range.end;
}
range.cursor = xBackwards ? range.start : range.end;
rectSel.push(range);
@@ -18263,7 +20302,7 @@ var Editor = require("./editor").Editor;
if (this.inVirtualSelectionMode)
return;
var keepOrder = options && options.keepOrder;
- var $byLines = options == true || options && options.$byLines
+ var $byLines = options == true || options && options.$byLines;
var session = this.session;
var selection = this.selection;
var rangeList = selection.rangeList;
@@ -18297,6 +20336,8 @@ var Editor = require("./editor").Editor;
this.inVirtualSelectionMode = false;
selection._eventRegistry = reg;
selection.mergeOverlappingRanges();
+ if (selection.ranges[0])
+ selection.fromOrientedRange(selection.ranges[0]);
var anim = this.renderer.$scrollAnimation;
this.onCursorChange();
@@ -18341,6 +20382,8 @@ var Editor = require("./editor").Editor;
if (pos.row != anchor.row
|| this.session.$clipPositionToDocument(pos.row, pos.column).column != anchor.column)
this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange());
+ else
+ this.multiSelect.mergeOverlappingRanges();
}
};
this.findAll = function(needle, options, additive) {
@@ -18358,7 +20401,6 @@ var Editor = require("./editor").Editor;
if (!ranges.length)
return 0;
- this.$blockScrolling += 1;
var selection = this.multiSelect;
if (!additive)
@@ -18369,8 +20411,6 @@ var Editor = require("./editor").Editor;
if (range && selection.rangeList.rangeAtPoint(range.start))
selection.addRange(range, true);
- this.$blockScrolling -= 1;
-
return ranges.length;
};
this.selectMoreLines = function(dir, skip) {
@@ -18445,6 +20485,7 @@ var Editor = require("./editor").Editor;
range.start.row = tmp.start.row;
range.start.column = tmp.start.column;
}
+ sel.fromOrientedRange(sel.ranges[0]);
};
this.selectMore = function(dir, skip, stopAtFirst) {
var session = this.session;
@@ -18463,10 +20504,8 @@ var Editor = require("./editor").Editor;
var newRange = find(session, needle, dir);
if (newRange) {
newRange.cursor = dir == -1 ? newRange.start : newRange.end;
- this.$blockScrolling += 1;
this.session.unfold(newRange);
this.multiSelect.addRange(newRange);
- this.$blockScrolling -= 1;
this.renderer.scrollCursorIntoView(null, 0.5);
}
if (skip)
@@ -18590,7 +20629,7 @@ var Editor = require("./editor").Editor;
}
function alignRight(m) {
return !m[2] ? m[0] : spaces(startW + textW - m[2].length) + m[2]
- + spaces(endW, " ")
+ + spaces(endW)
+ m[4].replace(/^([=:])\s+/, "$1 ");
}
function unAlign(m) {
@@ -18927,6 +20966,7 @@ border: 1px solid rgb(200, 200, 250);\
background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
}\
";
+exports.$id = "ace/theme/textmate";
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);
@@ -19151,7 +21191,7 @@ function LineWidgets(session) {
w.editor.destroy();
} catch(e){}
if (this.session.lineWidgets) {
- var w1 = this.session.lineWidgets[w.row]
+ var w1 = this.session.lineWidgets[w.row];
if (w1 == w) {
this.session.lineWidgets[w.row] = w.$oldWidget;
if (w.$oldWidget)
@@ -19470,7 +21510,7 @@ dom.importCssString("\
});
-define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"], function(require, exports, module) {
+define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/range","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"], function(require, exports, module) {
"use strict";
require("./lib/fixoldbrowsers");
@@ -19478,6 +21518,7 @@ require("./lib/fixoldbrowsers");
var dom = require("./lib/dom");
var event = require("./lib/event");
+var Range = require("./range").Range;
var Editor = require("./editor").Editor;
var EditSession = require("./edit_session").EditSession;
var UndoManager = require("./undomanager").UndoManager;
@@ -19495,7 +21536,7 @@ exports.require = require;
if (typeof define === "function")
exports.define = define;
-exports.edit = function(el) {
+exports.edit = function(el, options) {
if (typeof el == "string") {
var _id = el;
el = document.getElementById(_id);
@@ -19513,14 +21554,13 @@ exports.edit = function(el) {
el = dom.createElement("pre");
oldNode.parentNode.replaceChild(el, oldNode);
} else if (el) {
- value = dom.getInnerText(el);
+ value = el.textContent;
el.innerHTML = "";
}
var doc = exports.createEditSession(value);
- var editor = new Editor(new Renderer(el));
- editor.setSession(doc);
+ var editor = new Editor(new Renderer(el), doc, options);
var env = {
document: doc,
@@ -19540,12 +21580,14 @@ exports.createEditSession = function(text, mode) {
var doc = new EditSession(text, mode);
doc.setUndoManager(new UndoManager());
return doc;
-}
+};
+exports.Range = Range;
+exports.Editor = Editor;
exports.EditSession = EditSession;
exports.UndoManager = UndoManager;
-exports.version = "1.2.8";
-});
- (function() {
+exports.VirtualRenderer = Renderer;
+exports.version = exports.config.version;
+}); (function() {
window.require(["ace/ace"], function(a) {
if (a) {
a.config.init(true);
@@ -19555,6 +21597,10 @@ exports.version = "1.2.8";
window.ace = a;
for (var key in a) if (a.hasOwnProperty(key))
window.ace[key] = a[key];
+ window.ace["default"] = window.ace;
+ if (typeof module == "object" && typeof exports == "object" && module) {
+ module.exports = window.ace;
+ }
});
})();
\ No newline at end of file
diff --git a/chrome/content/scaffold/ace/ext-searchbox.js b/chrome/content/scaffold/ace/ext-searchbox.js
index ebc5886393..4fbe793350 100644
--- a/chrome/content/scaffold/ace/ext-searchbox.js
+++ b/chrome/content/scaffold/ace/ext-searchbox.js
@@ -45,7 +45,6 @@ background-color: white;\
color: black;\
border: 1px solid #cbcbcb;\
border-right: 0 none;\
-box-sizing: border-box!important;\
outline: 0;\
padding: 0;\
font-size: inherit;\
@@ -54,6 +53,8 @@ line-height: inherit;\
padding: 0 6px;\
min-width: 17em;\
vertical-align: top;\
+min-height: 1.8em;\
+box-sizing: content-box;\
}\
.ace_searchbtn {\
border: 1px solid #cbcbcb;\
@@ -66,7 +67,6 @@ border-left: 1px solid #dcdcdc;\
cursor: pointer;\
margin: 0;\
position: relative;\
-box-sizing: content-box!important;\
color: #666;\
}\
.ace_searchbtn:last-child {\
@@ -162,39 +162,38 @@ var MAX_COUNT = 999;
dom.importCssString(searchboxCss, "ace_searchbox");
-var html = '\
-
\
-
\
- \
- \
- \
- All\
-
\
-
\
- \
- Replace\
- All\
-
\
-
\
- +\
- \
- .*\
- Aa\
- \\b\
- S\
-
\
-
', type: 'keyToKey', toKeys: 'x', context: 'normal'},
{ keys: '', type: 'keyToKey', toKeys: 'W' },
{ keys: '', type: 'keyToKey', toKeys: 'B', context: 'normal' },
{ keys: '', type: 'keyToKey', toKeys: 'w' },
@@ -834,6 +855,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: '', type: 'keyToKey', toKeys: '' },
{ keys: '', type: 'keyToKey', toKeys: '' },
{ keys: '', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
+ { keys: '', type: 'action', action: 'toggleOverwrite', context: 'insert' },
{ keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
{ keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
{ keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
@@ -853,6 +875,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
{ keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
{ keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+ { keys: '(', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: false }},
+ { keys: ')', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: true }},
{ keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
{ keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
{ keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
@@ -888,6 +912,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: 'd', type: 'operator', operator: 'delete' },
{ keys: 'y', type: 'operator', operator: 'yank' },
{ keys: 'c', type: 'operator', operator: 'change' },
+ { keys: '=', type: 'operator', operator: 'indentAuto' },
{ keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
{ keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
{ keys: 'g~', type: 'operator', operator: 'changeCase' },
@@ -899,13 +924,14 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
{ keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
{ keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
- { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+ { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'expandToLine', motionArgs: { linewise: true }, context: 'normal'},
{ keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
{ keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
{ keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
{ keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
{ keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
{ keys: '', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
+ { keys: '', type: 'idle', context: 'normal' },
{ keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
{ keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
{ keys: '', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
@@ -929,7 +955,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: 'r', type: 'action', action: 'replace', isEdit: true },
{ keys: '@', type: 'action', action: 'replayMacro' },
{ keys: 'q', type: 'action', action: 'enterMacroRecordMode' },
- { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+ { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }, context: 'normal'},
+ { keys: 'R', type: 'operator', operator: 'change', operatorArgs: { linewise: true, fullLine: true }, context: 'visual', exitVisualBlock: true},
{ keys: 'u', type: 'action', action: 'undo', context: 'normal' },
{ keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
{ keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
@@ -945,6 +972,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: '.', type: 'action', action: 'repeatLastEdit' },
{ keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
{ keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
+ { keys: '', type: 'action', action: 'indent', actionArgs: { indentRight: true }, context: 'insert' },
+ { keys: '', type: 'action', action: 'indent', actionArgs: { indentRight: false }, context: 'insert' },
{ keys: 'a', type: 'motion', motion: 'textObjectManipulation' },
{ keys: 'i', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
{ keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
@@ -955,6 +984,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
{ keys: ':', type: 'ex' }
];
+ var defaultKeymapLength = defaultKeymap.length;
var defaultExCommandMap = [
{ name: 'colorscheme', shortName: 'colo' },
{ name: 'map' },
@@ -972,6 +1002,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
{ name: 'sort', shortName: 'sor' },
{ name: 'substitute', shortName: 's', possiblyAsync: true },
{ name: 'nohlsearch', shortName: 'noh' },
+ { name: 'yank', shortName: 'y' },
{ name: 'delmarks', shortName: 'delm' },
{ name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
{ name: 'global', shortName: 'g' }
@@ -1001,7 +1032,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
if (!next || next.attach != attachVimMap)
- leaveVimMode(cm, false);
+ leaveVimMode(cm);
}
function attachVimMap(cm, prev) {
if (this == CodeMirror.keyMap.vim)
@@ -1019,6 +1050,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
function cmKey(key, cm) {
if (!cm) { return undefined; }
+ if (this[key]) { return this[key]; }
var vimKey = cmKeyToVimKey(key);
if (!vimKey) {
return false;
@@ -1031,7 +1063,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
- var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+ var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
function cmKeyToVimKey(key) {
if (key.charAt(0) == '\'') {
return key.charAt(1);
@@ -1109,6 +1141,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
function isWhiteSpaceString(k) {
return (/^\s*$/).test(k);
}
+ function isEndOfSentenceSymbol(k) {
+ return '.?!'.indexOf(k) != -1;
+ }
function inArray(val, arr) {
for (var i = 0; i < arr.length; i++) {
if (arr[i] == val) {
@@ -1144,11 +1179,11 @@ dom.importCssString(".normal-mode .ace_cursor{\
cfg = cfg || {};
var scope = cfg.scope;
if (!option) {
- throw Error('Unknown option: ' + name);
+ return new Error('Unknown option: ' + name);
}
if (option.type == 'boolean') {
if (value && value !== true) {
- throw Error('Invalid argument: ' + name + '=' + value);
+ return new Error('Invalid argument: ' + name + '=' + value);
} else if (value !== false) {
value = true;
}
@@ -1175,7 +1210,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
cfg = cfg || {};
var scope = cfg.scope;
if (!option) {
- throw Error('Unknown option: ' + name);
+ return new Error('Unknown option: ' + name);
}
if (option.callback) {
var local = cm && option.callback(undefined, cm);
@@ -1344,10 +1379,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
lastSubstituteReplacePart: undefined,
jumpList: createCircularJumpList(),
macroModeState: new MacroModeState,
- lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
+ lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
registerController: new RegisterController({}),
- searchHistoryController: new HistoryController({}),
- exCommandHistoryController : new HistoryController({})
+ searchHistoryController: new HistoryController(),
+ exCommandHistoryController : new HistoryController()
};
for (var optionName in options) {
var option = options[optionName];
@@ -1377,6 +1412,62 @@ dom.importCssString(".normal-mode .ace_cursor{\
unmap: function(lhs, ctx) {
exCommandDispatcher.unmap(lhs, ctx);
},
+ noremap: function(lhs, rhs, ctx) {
+ function toCtxArray(ctx) {
+ return ctx ? [ctx] : ['normal', 'insert', 'visual'];
+ }
+ var ctxsToMap = toCtxArray(ctx);
+ var actualLength = defaultKeymap.length, origLength = defaultKeymapLength;
+ for (var i = actualLength - origLength;
+ i < actualLength && ctxsToMap.length;
+ i++) {
+ var mapping = defaultKeymap[i];
+ if (mapping.keys == rhs &&
+ (!ctx || !mapping.context || mapping.context === ctx) &&
+ mapping.type.substr(0, 2) !== 'ex' &&
+ mapping.type.substr(0, 3) !== 'key') {
+ var newMapping = {};
+ for (var key in mapping) {
+ newMapping[key] = mapping[key];
+ }
+ newMapping.keys = lhs;
+ if (ctx && !newMapping.context) {
+ newMapping.context = ctx;
+ }
+ this._mapCommand(newMapping);
+ var mappedCtxs = toCtxArray(mapping.context);
+ ctxsToMap = ctxsToMap.filter(function(el) { return mappedCtxs.indexOf(el) === -1; });
+ }
+ }
+ },
+ mapclear: function(ctx) {
+ var actualLength = defaultKeymap.length,
+ origLength = defaultKeymapLength;
+ var userKeymap = defaultKeymap.slice(0, actualLength - origLength);
+ defaultKeymap = defaultKeymap.slice(actualLength - origLength);
+ if (ctx) {
+ for (var i = userKeymap.length - 1; i >= 0; i--) {
+ var mapping = userKeymap[i];
+ if (ctx !== mapping.context) {
+ if (mapping.context) {
+ this._mapCommand(mapping);
+ } else {
+ var contexts = ['normal', 'insert', 'visual'];
+ for (var j in contexts) {
+ if (contexts[j] !== ctx) {
+ var newMapping = {};
+ for (var key in mapping) {
+ newMapping[key] = mapping[key];
+ }
+ newMapping.context = contexts[j];
+ this._mapCommand(newMapping);
+ }
+ }
+ }
+ }
+ }
+ }
+ },
setOption: setOption,
getOption: getOption,
defineOption: defineOption,
@@ -1489,7 +1580,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
if (vim.insertMode) { command = handleKeyInsertMode(); }
else { command = handleKeyNonInsertMode(); }
if (command === false) {
- return undefined;
+ return undefined; //ace_patch
} else if (command === true) {
return function() { return true; };
} else {
@@ -1608,7 +1699,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
};
function defineRegister(name, register) {
- var registers = vimGlobalState.registerController.registers[name];
+ var registers = vimGlobalState.registerController.registers;
if (!name || name.length != 1) {
throw Error('Register name must be 1 character');
}
@@ -1624,9 +1715,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
RegisterController.prototype = {
pushText: function(registerName, operator, text, linewise, blockwise) {
- if (linewise && text.charAt(0) == '\n') {
- text = text.slice(1) + '\n';
- }
if (linewise && text.charAt(text.length - 1) !== '\n'){
text += '\n';
}
@@ -1679,7 +1767,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
};
function HistoryController() {
this.historyBuffer = [];
- this.iterator;
+ this.iterator = 0;
this.initialPrefix = null;
}
HistoryController.prototype = {
@@ -1730,7 +1818,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
if (bestMatch.keys.slice(-11) == '') {
var character = lastChar(keys);
- if (//.test(character)) return {type: 'none'};
+ if (//.test(character) || !character) return {type: 'none'}; //ace_patch
inputState.selectedCharacter = character;
}
return {type: 'full', command: bestMatch};
@@ -1780,6 +1868,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
inputState.operator = command.operator;
inputState.operatorArgs = copyArgs(command.operatorArgs);
+ if (command.exitVisualBlock) {
+ vim.visualBlock = false;
+ updateCmSelection(cm);
+ }
if (vim.visualMode) {
this.evalInput(cm, vim);
}
@@ -1851,7 +1943,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
});
}
function onPromptClose(query) {
- cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
handleQuery(query, true /** ignoreCase */, true /** smartCase */);
var macroModeState = vimGlobalState.macroModeState;
if (macroModeState.isRecording) {
@@ -1859,11 +1950,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
}
function onPromptKeyUp(e, query, close) {
- var keyName = CodeMirror.keyName(e), up;
+ var keyName = CodeMirror.keyName(e), up, offset;
if (keyName == 'Up' || keyName == 'Down') {
up = keyName == 'Up' ? true : false;
+ offset = e.target ? e.target.selectionEnd : 0;
query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
close(query);
+ if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
} else {
if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
vimGlobalState.searchHistoryController.reset();
@@ -1894,6 +1987,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
clearInputState(cm);
close();
cm.focus();
+ } else if (keyName == 'Up' || keyName == 'Down') {
+ CodeMirror.e_stop(e);
} else if (keyName == 'Ctrl-U') {
CodeMirror.e_stop(e);
close('');
@@ -1950,7 +2045,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
exCommandDispatcher.processCommand(cm, input);
}
function onPromptKeyDown(e, input, close) {
- var keyName = CodeMirror.keyName(e), up;
+ var keyName = CodeMirror.keyName(e), up, offset;
if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
(keyName == 'Backspace' && input == '')) {
vimGlobalState.exCommandHistoryController.pushInput(input);
@@ -1961,9 +2056,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
cm.focus();
}
if (keyName == 'Up' || keyName == 'Down') {
+ CodeMirror.e_stop(e);
up = keyName == 'Up' ? true : false;
+ offset = e.target ? e.target.selectionEnd : 0;
input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
close(input);
+ if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
} else if (keyName == 'Ctrl-U') {
CodeMirror.e_stop(e);
close('');
@@ -1977,7 +2075,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
} else {
if (vim.visualMode) {
showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
- onKeyDown: onPromptKeyDown});
+ onKeyDown: onPromptKeyDown, selectValueOnOpen: false});
} else {
showPrompt(cm, { onClose: onPromptClose, prefix: ':',
onKeyDown: onPromptKeyDown});
@@ -2165,6 +2263,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
vim.lastEditActionCommand = actionCommand;
macroModeState.lastInsertModeChanges.changes = [];
macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
+ macroModeState.lastInsertModeChanges.visualBlock = vim.visualBlock ? vim.sel.head.line - vim.sel.anchor.line : 0;
}
};
var motions = {
@@ -2197,9 +2296,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
return findNext(cm, prev/** prev */, query, motionArgs.repeat);
},
goToMark: function(cm, _head, motionArgs, vim) {
- var mark = vim.marks[motionArgs.selectedCharacter];
- if (mark) {
- var pos = mark.find();
+ var pos = getMarkPos(cm, vim, motionArgs.selectedCharacter);
+ if (pos) {
return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
}
return null;
@@ -2274,9 +2372,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
var first = cm.firstLine();
var last = cm.lastLine();
- if ((line < first && cur.line == first) ||
- (line > last && cur.line == last)) {
- return;
+ if (line < first && cur.line == first){
+ return this.moveToStartOfLine(cm, head, motionArgs, vim);
+ }else if (line > last && cur.line == last){
+ return this.moveToEol(cm, head, motionArgs, vim, true);
}
var fold = cm.ace.session.getFoldLine(line);
if (fold) {
@@ -2331,6 +2430,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
var dir = motionArgs.forward ? 1 : -1;
return findParagraph(cm, head, motionArgs.repeat, dir);
},
+ moveBySentence: function(cm, head, motionArgs) {
+ var dir = motionArgs.forward ? 1 : -1;
+ return findSentence(cm, head, motionArgs.repeat, dir);
+ },
moveByScroll: function(cm, head, motionArgs, vim) {
var scrollbox = cm.getScrollInfo();
var curEnd = null;
@@ -2379,13 +2482,15 @@ dom.importCssString(".normal-mode .ace_cursor{\
vim.lastHSPos = cm.charCoords(head,'div').left;
return moveToColumn(cm, repeat);
},
- moveToEol: function(cm, head, motionArgs, vim) {
+ moveToEol: function(cm, head, motionArgs, vim, keepHPos) {
var cur = head;
- vim.lastHPos = Infinity;
var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
var end=cm.clipPos(retval);
end.ch--;
- vim.lastHSPos = cm.charCoords(end,'div').left;
+ if (!keepHPos) {
+ vim.lastHPos = Infinity;
+ vim.lastHSPos = cm.charCoords(end,'div').left;
+ }
return retval;
},
moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
@@ -2399,17 +2504,18 @@ dom.importCssString(".normal-mode .ace_cursor{\
var ch = cursor.ch;
var lineText = cm.getLine(line);
var symbol;
- do {
- symbol = lineText.charAt(ch++);
+ for (; ch < lineText.length; ch++) {
+ symbol = lineText.charAt(ch);
if (symbol && isMatchableSymbol(symbol)) {
- var style = cm.getTokenTypeAt(Pos(line, ch));
+ var style = cm.getTokenTypeAt(Pos(line, ch + 1));
if (style !== "string" && style !== "comment") {
break;
}
}
- } while (symbol);
- if (symbol) {
- var matched = cm.findMatchingBracket(Pos(line, ch));
+ }
+ if (ch < lineText.length) {
+ var re = /[<>]/.test(lineText[ch]) ? /[(){}[\]<>]/ : /[(){}[\]]/;
+ var matched = cm.findMatchingBracket(Pos(line, ch+1), {bracketRegex: re});
return matched.to;
} else {
return cursor;
@@ -2429,8 +2535,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
textObjectManipulation: function(cm, head, motionArgs, vim) {
var mirroredPairs = {'(': ')', ')': '(',
'{': '}', '}': '{',
- '[': ']', ']': '['};
- var selfPaired = {'\'': true, '"': true};
+ '[': ']', ']': '[',
+ '<': '>', '>': '<'};
+ var selfPaired = {'\'': true, '"': true, '`': true};
var character = motionArgs.selectedCharacter;
if (character == 'b') {
@@ -2473,7 +2580,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
},
repeatLastCharacterSearch: function(cm, head, motionArgs) {
- var lastSearch = vimGlobalState.lastChararacterSearch;
+ var lastSearch = vimGlobalState.lastCharacterSearch;
var repeat = motionArgs.repeat;
var forward = motionArgs.forward === lastSearch.forward;
var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
@@ -2504,10 +2611,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
change: function(cm, args, ranges) {
var finalHead, text;
var vim = cm.state.vim;
- vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+ var anchor = ranges[0].anchor,
+ head = ranges[0].head;
if (!vim.visualMode) {
- var anchor = ranges[0].anchor,
- head = ranges[0].head;
text = cm.getRange(anchor, head);
var lastState = vim.lastEditInputState || {};
if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
@@ -2532,6 +2638,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
anchor.ch = Number.MAX_VALUE;
}
finalHead = anchor;
+ } else if (args.fullLine) {
+ head.ch = Number.MAX_VALUE;
+ head.line--;
+ cm.setSelection(anchor, head)
+ text = cm.getSelection();
+ cm.replaceSelections("");
+ finalHead = anchor
} else {
text = cm.getSelection();
var replacement = fillArray('', ranges.length);
@@ -2574,7 +2687,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
vimGlobalState.registerController.pushText(
args.registerName, 'delete', text,
args.linewise, vim.visualBlock);
- return clipCursorToContent(cm, finalHead);
+ var includeLineBreak = vim.insertMode
+ return clipCursorToContent(cm, finalHead, includeLineBreak);
},
indent: function(cm, args, ranges) {
var vim = cm.state.vim;
@@ -2593,6 +2707,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
},
+ indentAuto: function(cm, _args, ranges) {
+ cm.execCommand("indentAuto");
+ return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
+ },
changeCase: function(cm, args, ranges, oldAnchor, newHead) {
var selections = cm.getSelections();
var swapped = [];
@@ -2700,9 +2818,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
switch (actionArgs.position) {
case 'center': y = y - (height / 2) + lineHeight;
break;
- case 'bottom': y = y - height + lineHeight*1.4;
- break;
- case 'top': y = y + lineHeight*0.4;
+ case 'bottom': y = y - height + lineHeight;
break;
}
cm.scrollTo(null, y);
@@ -2713,6 +2829,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
var macroModeState = vimGlobalState.macroModeState;
if (registerName == '@') {
registerName = macroModeState.latestRegister;
+ } else {
+ macroModeState.latestRegister = registerName;
}
while(repeat--){
executeMacroRegister(cm, vim, macroModeState, registerName);
@@ -2721,7 +2839,20 @@ dom.importCssString(".normal-mode .ace_cursor{\
enterMacroRecordMode: function(cm, actionArgs) {
var macroModeState = vimGlobalState.macroModeState;
var registerName = actionArgs.selectedCharacter;
- macroModeState.enterMacroRecordMode(cm, registerName);
+ if (vimGlobalState.registerController.isValidRegister(registerName)) {
+ macroModeState.enterMacroRecordMode(cm, registerName);
+ }
+ },
+ toggleOverwrite: function(cm) {
+ if (!cm.state.overwrite) {
+ cm.toggleOverwrite(true);
+ cm.setOption('keyMap', 'vim-replace');
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
+ } else {
+ cm.toggleOverwrite(false);
+ cm.setOption('keyMap', 'vim-insert');
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
+ }
},
enterInsertMode: function(cm, actionArgs, vim) {
if (cm.getOption('readOnly')) { return; }
@@ -2738,6 +2869,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
} else if (insertAt == 'firstNonBlank') {
head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
} else if (insertAt == 'startOfSelectedArea') {
+ if (!vim.visualMode)
+ return;
if (!vim.visualBlock) {
if (sel.head.line < sel.anchor.line) {
head = sel.head;
@@ -2751,6 +2884,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
height = Math.abs(sel.head.line - sel.anchor.line) + 1;
}
} else if (insertAt == 'endOfSelectedArea') {
+ if (!vim.visualMode)
+ return;
if (!vim.visualBlock) {
if (sel.head.line >= sel.anchor.line) {
head = offsetCursor(sel.head, 0, 1);
@@ -2768,13 +2903,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
return;
}
}
- cm.setOption('keyMap', 'vim-insert');
cm.setOption('disableInput', false);
if (actionArgs && actionArgs.replace) {
cm.toggleOverwrite(true);
cm.setOption('keyMap', 'vim-replace');
CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
} else {
+ cm.toggleOverwrite(false);
cm.setOption('keyMap', 'vim-insert');
CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
}
@@ -2932,7 +3067,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
var linewise = register.linewise;
var blockwise = register.blockwise;
- if (linewise && !blockwise) {
+ if (blockwise) {
+ text = text.split('\n');
+ if (linewise) {
+ text.pop();
+ }
+ for (var i = 0; i < text.length; i++) {
+ text[i] = (text[i] == '') ? ' ' : text[i];
+ }
+ cur.ch += actionArgs.after ? 1 : 0;
+ cur.ch = Math.min(lineLength(cm, cur.line), cur.ch);
+ } else if (linewise) {
if(vim.visualMode) {
text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
} else if (actionArgs.after) {
@@ -2942,12 +3087,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
cur.ch = 0;
}
} else {
- if (blockwise) {
- text = text.split('\n');
- for (var i = 0; i < text.length; i++) {
- text[i] = (text[i] == '') ? ' ' : text[i];
- }
- }
cur.ch += actionArgs.after ? 1 : 0;
}
var curPosFinal;
@@ -3088,25 +3227,32 @@ dom.importCssString(".normal-mode .ace_cursor{\
incrementNumberToken: function(cm, actionArgs) {
var cur = cm.getCursor();
var lineStr = cm.getLine(cur.line);
- var re = /-?\d+/g;
+ var re = /(-?)(?:(0x)([\da-f]+)|(0b|0|)(\d+))/gi;
var match;
var start;
var end;
var numberStr;
- var token;
while ((match = re.exec(lineStr)) !== null) {
- token = match[0];
start = match.index;
- end = start + token.length;
+ end = start + match[0].length;
if (cur.ch < end)break;
}
if (!actionArgs.backtrack && (end <= cur.ch))return;
- if (token) {
+ if (match) {
+ var baseStr = match[2] || match[4]
+ var digits = match[3] || match[5]
var increment = actionArgs.increase ? 1 : -1;
- var number = parseInt(token) + (increment * actionArgs.repeat);
+ var base = {'0b': 2, '0': 8, '': 10, '0x': 16}[baseStr.toLowerCase()];
+ var number = parseInt(match[1] + digits, base) + (increment * actionArgs.repeat);
+ numberStr = number.toString(base);
+ var zeroPadding = baseStr ? new Array(digits.length - numberStr.length + 1 + match[1].length).join('0') : ''
+ if (numberStr.charAt(0) === '-') {
+ numberStr = '-' + baseStr + zeroPadding + numberStr.substr(1);
+ } else {
+ numberStr = baseStr + zeroPadding + numberStr;
+ }
var from = Pos(cur.line, start);
var to = Pos(cur.line, end);
- numberStr = number.toString();
cm.replaceRange(numberStr, from, to);
} else {
return;
@@ -3124,6 +3270,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
},
+ indent: function(cm, actionArgs) {
+ cm.indentLine(cm.getCursor().line, actionArgs.indentRight);
+ },
exitInsertMode: exitInsertMode
};
@@ -3153,12 +3302,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
return Pos(cur.line + offsetLine, cur.ch + offsetCh);
}
- function getOffset(anchor, head) {
- return {
- line: head.line - anchor.line,
- ch: head.line - anchor.line
- };
- }
function commandMatches(keys, keyMap, context, inputState) {
var match, partial = [], full = [];
for (var i = 0; i < keyMap.length; i++) {
@@ -3188,7 +3331,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
}
function lastChar(keys) {
- var match = /^.*(<[\w\-]+>)$/.exec(keys);
+ var match = /^.*(<[^>]+>)$/.exec(keys);
var selectedCharacter = match ? match[1] : keys.slice(-1);
if (selectedCharacter.length > 1){
switch(selectedCharacter){
@@ -3199,6 +3342,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
selectedCharacter=' ';
break;
default:
+ selectedCharacter='';
break;
}
}
@@ -3292,7 +3436,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
selections.push(range);
}
- primIndex = head.line == lastLine ? selections.length - 1 : 0;
cm.setSelections(selections);
selectionEnd.ch = headCh;
base.ch = baseCh;
@@ -3554,9 +3697,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
function recordLastCharacterSearch(increment, args) {
- vimGlobalState.lastChararacterSearch.increment = increment;
- vimGlobalState.lastChararacterSearch.forward = args.forward;
- vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
+ vimGlobalState.lastCharacterSearch.increment = increment;
+ vimGlobalState.lastCharacterSearch.forward = args.forward;
+ vimGlobalState.lastCharacterSearch.selectedCharacter = args.selectedCharacter;
}
var symbolToMode = {
@@ -3730,7 +3873,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
line = cm.getLine(lineNum);
pos = (dir > 0) ? 0 : line.length;
}
- throw new Error('The impossible happened.');
}
function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
var curStart = copyCursor(cur);
@@ -3872,22 +4014,160 @@ dom.importCssString(".normal-mode .ace_cursor{\
start = new Pos(i, 0);
return { start: start, end: end };
}
+
+ function findSentence(cm, cur, repeat, dir) {
+ function nextChar(cm, idx) {
+ if (idx.pos + idx.dir < 0 || idx.pos + idx.dir >= idx.line.length) {
+ idx.ln += idx.dir;
+ if (!isLine(cm, idx.ln)) {
+ idx.line = null;
+ idx.ln = null;
+ idx.pos = null;
+ return;
+ }
+ idx.line = cm.getLine(idx.ln);
+ idx.pos = (idx.dir > 0) ? 0 : idx.line.length - 1;
+ }
+ else {
+ idx.pos += idx.dir;
+ }
+ }
+ function forward(cm, ln, pos, dir) {
+ var line = cm.getLine(ln);
+ var stop = (line === "");
+
+ var curr = {
+ line: line,
+ ln: ln,
+ pos: pos,
+ dir: dir,
+ }
+
+ var last_valid = {
+ ln: curr.ln,
+ pos: curr.pos,
+ }
+
+ var skip_empty_lines = (curr.line === "");
+ nextChar(cm, curr);
+
+ while (curr.line !== null) {
+ last_valid.ln = curr.ln;
+ last_valid.pos = curr.pos;
+
+ if (curr.line === "" && !skip_empty_lines) {
+ return { ln: curr.ln, pos: curr.pos, };
+ }
+ else if (stop && curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
+ return { ln: curr.ln, pos: curr.pos, };
+ }
+ else if (isEndOfSentenceSymbol(curr.line[curr.pos])
+ && !stop
+ && (curr.pos === curr.line.length - 1
+ || isWhiteSpaceString(curr.line[curr.pos + 1]))) {
+ stop = true;
+ }
+
+ nextChar(cm, curr);
+ }
+ var line = cm.getLine(last_valid.ln);
+ last_valid.pos = 0;
+ for(var i = line.length - 1; i >= 0; --i) {
+ if (!isWhiteSpaceString(line[i])) {
+ last_valid.pos = i;
+ break;
+ }
+ }
+
+ return last_valid;
+
+ }
+ function reverse(cm, ln, pos, dir) {
+ var line = cm.getLine(ln);
+
+ var curr = {
+ line: line,
+ ln: ln,
+ pos: pos,
+ dir: dir,
+ }
+
+ var last_valid = {
+ ln: curr.ln,
+ pos: null,
+ };
+
+ var skip_empty_lines = (curr.line === "");
+ nextChar(cm, curr);
+
+ while (curr.line !== null) {
+
+ if (curr.line === "" && !skip_empty_lines) {
+ if (last_valid.pos !== null) {
+ return last_valid;
+ }
+ else {
+ return { ln: curr.ln, pos: curr.pos };
+ }
+ }
+ else if (isEndOfSentenceSymbol(curr.line[curr.pos])
+ && last_valid.pos !== null
+ && !(curr.ln === last_valid.ln && curr.pos + 1 === last_valid.pos)) {
+ return last_valid;
+ }
+ else if (curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
+ skip_empty_lines = false;
+ last_valid = { ln: curr.ln, pos: curr.pos }
+ }
+
+ nextChar(cm, curr);
+ }
+ var line = cm.getLine(last_valid.ln);
+ last_valid.pos = 0;
+ for(var i = 0; i < line.length; ++i) {
+ if (!isWhiteSpaceString(line[i])) {
+ last_valid.pos = i;
+ break;
+ }
+ }
+ return last_valid;
+ }
+
+ var curr_index = {
+ ln: cur.line,
+ pos: cur.ch,
+ };
+
+ while (repeat > 0) {
+ if (dir < 0) {
+ curr_index = reverse(cm, curr_index.ln, curr_index.pos, dir);
+ }
+ else {
+ curr_index = forward(cm, curr_index.ln, curr_index.pos, dir);
+ }
+ repeat--;
+ }
+
+ return Pos(curr_index.ln, curr_index.pos);
+ }
function selectCompanionObject(cm, head, symb, inclusive) {
var cur = head, start, end;
var bracketRegexp = ({
'(': /[()]/, ')': /[()]/,
'[': /[[\]]/, ']': /[[\]]/,
- '{': /[{}]/, '}': /[{}]/})[symb];
+ '{': /[{}]/, '}': /[{}]/,
+ '<': /[<>]/, '>': /[<>]/})[symb];
var openSym = ({
'(': '(', ')': '(',
'[': '[', ']': '[',
- '{': '{', '}': '{'})[symb];
+ '{': '{', '}': '{',
+ '<': '<', '>': '<'})[symb];
var curChar = cm.getLine(cur.line).charAt(cur.ch);
var offset = curChar === openSym ? 1 : 0;
- start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp});
- end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp});
+ start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
+ end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
if (!start || !end) {
return { start: cur, end: cur };
@@ -3988,14 +4268,27 @@ dom.importCssString(".normal-mode .ace_cursor{\
if (cm.openDialog) {
cm.openDialog(template, onClose, { bottom: true, value: options.value,
onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
- selectValueOnOpen: false});
+ selectValueOnOpen: false, onClose: function() {
+ if (cm.state.vim) {
+ cm.state.vim.status = "";
+ cm.ace.renderer.$loop.schedule(cm.ace.renderer.CHANGE_CURSOR);
+ }
+ }});
}
else {
onClose(prompt(shortText, ''));
}
}
function splitBySlash(argString) {
- var slashes = findUnescapedSlashes(argString) || [];
+ return splitBySeparator(argString, '/');
+ }
+
+ function findUnescapedSlashes(argString) {
+ return findUnescapedSeparators(argString, '/');
+ }
+
+ function splitBySeparator(argString, separator) {
+ var slashes = findUnescapedSeparators(argString, separator) || [];
if (!slashes.length) return [];
var tokens = [];
if (slashes[0] !== 0) return;
@@ -4006,12 +4299,15 @@ dom.importCssString(".normal-mode .ace_cursor{\
return tokens;
}
- function findUnescapedSlashes(str) {
+ function findUnescapedSeparators(str, separator) {
+ if (!separator)
+ separator = '/';
+
var escapeNextChar = false;
var slashes = [];
for (var i = 0; i < str.length; i++) {
var c = str.charAt(i);
- if (!escapeNextChar && c == '/') {
+ if (!escapeNextChar && c == separator) {
slashes.push(i);
}
escapeNextChar = !escapeNextChar && (c == '\\');
@@ -4143,17 +4439,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
}
function makePrompt(prefix, desc) {
- var raw = '';
- if (prefix) {
- raw += '' + prefix + '';
- }
- raw += ' ' +
- '';
- if (desc) {
- raw += '';
- raw += desc;
- raw += '';
- }
+ var raw = '' +
+ (prefix || "") + '';
+ if (desc)
+ raw += ' ' + desc + '';
return raw;
}
var searchPromptDesc = '(Javascript regexp)';
@@ -4293,6 +4582,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
}
+ function getMarkPos(cm, vim, markName) {
+
+ var mark = vim.marks[markName];
+ return mark && mark.find();
+ }
+
var ExCommandDispatcher = function() {
this.buildCommandMap_();
};
@@ -4387,20 +4682,35 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
switch (inputStream.next()) {
case '.':
- return cm.getCursor().line;
+ return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
case '$':
- return cm.lastLine();
+ return this.parseLineSpecOffset_(inputStream, cm.lastLine());
case '\'':
- var mark = cm.state.vim.marks[inputStream.next()];
- if (mark && mark.find()) {
- return mark.find().line;
- }
- throw new Error('Mark not set');
+ var markName = inputStream.next();
+ var markPos = getMarkPos(cm, cm.state.vim, markName);
+ if (!markPos) throw new Error('Mark not set');
+ return this.parseLineSpecOffset_(inputStream, markPos.line);
+ case '-':
+ case '+':
+ inputStream.backUp(1);
+ return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
default:
inputStream.backUp(1);
return undefined;
}
},
+ parseLineSpecOffset_: function(inputStream, line) {
+ var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
+ if (offsetMatch) {
+ var offset = parseInt(offsetMatch[2], 10);
+ if (offsetMatch[1] == "-") {
+ line -= offset;
+ } else {
+ line += offset;
+ }
+ }
+ return line;
+ },
parseCommandArgs_: function(inputStream, params, command) {
if (inputStream.eol()) {
return;
@@ -4456,16 +4766,15 @@ dom.importCssString(".normal-mode .ace_cursor{\
var mapping = {
keys: lhs,
type: 'keyToEx',
- exArgs: { input: rhs.substring(1) },
- user: true};
+ exArgs: { input: rhs.substring(1) }
+ };
if (ctx) { mapping.context = ctx; }
defaultKeymap.unshift(mapping);
} else {
var mapping = {
keys: lhs,
type: 'keyToKey',
- toKeys: rhs,
- user: true
+ toKeys: rhs
};
if (ctx) { mapping.context = ctx; }
defaultKeymap.unshift(mapping);
@@ -4484,8 +4793,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
var keys = lhs;
for (var i = 0; i < defaultKeymap.length; i++) {
if (keys == defaultKeymap[i].keys
- && defaultKeymap[i].context === ctx
- && defaultKeymap[i].user) {
+ && defaultKeymap[i].context === ctx) {
defaultKeymap.splice(i, 1);
return;
}
@@ -4563,13 +4871,18 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
if (!optionIsBoolean && value === undefined || forceGet) {
var oldValue = getOption(optionName, cm, setCfg);
- if (oldValue === true || oldValue === false) {
+ if (oldValue instanceof Error) {
+ showConfirm(cm, oldValue.message);
+ } else if (oldValue === true || oldValue === false) {
showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
} else {
showConfirm(cm, ' ' + optionName + '=' + oldValue);
}
} else {
- setOption(optionName, value, cm, setCfg);
+ var setOptionReturn = setOption(optionName, value, cm, setCfg);
+ if (setOptionReturn instanceof Error) {
+ showConfirm(cm, setOptionReturn.message);
+ }
}
},
setlocal: function (cm, params) {
@@ -4606,25 +4919,27 @@ dom.importCssString(".normal-mode .ace_cursor{\
showConfirm(cm, regInfo);
},
sort: function(cm, params) {
- var reverse, ignoreCase, unique, number;
+ var reverse, ignoreCase, unique, number, pattern;
function parseArgs() {
if (params.argString) {
var args = new CodeMirror.StringStream(params.argString);
if (args.eat('!')) { reverse = true; }
if (args.eol()) { return; }
if (!args.eatSpace()) { return 'Invalid arguments'; }
- var opts = args.match(/[a-z]+/);
- if (opts) {
- opts = opts[0];
- ignoreCase = opts.indexOf('i') != -1;
- unique = opts.indexOf('u') != -1;
- var decimal = opts.indexOf('d') != -1 && 1;
- var hex = opts.indexOf('x') != -1 && 1;
- var octal = opts.indexOf('o') != -1 && 1;
+ var opts = args.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);
+ if (!opts && !args.eol()) { return 'Invalid arguments'; }
+ if (opts[1]) {
+ ignoreCase = opts[1].indexOf('i') != -1;
+ unique = opts[1].indexOf('u') != -1;
+ var decimal = opts[1].indexOf('d') != -1 || opts[1].indexOf('n') != -1 && 1;
+ var hex = opts[1].indexOf('x') != -1 && 1;
+ var octal = opts[1].indexOf('o') != -1 && 1;
if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
}
- if (args.match(/\/.*\//)) { return 'patterns not supported'; }
+ if (opts[2]) {
+ pattern = new RegExp(opts[2].substr(1, opts[2].length - 2), ignoreCase ? 'i' : '');
+ }
}
}
var err = parseArgs();
@@ -4638,14 +4953,18 @@ dom.importCssString(".normal-mode .ace_cursor{\
var curStart = Pos(lineStart, 0);
var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
var text = cm.getRange(curStart, curEnd).split('\n');
- var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
+ var numberRegex = pattern ? pattern :
+ (number == 'decimal') ? /(-?)([\d]+)/ :
(number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
(number == 'octal') ? /([0-7]+)/ : null;
var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
var numPart = [], textPart = [];
- if (number) {
+ if (number || pattern) {
for (var i = 0; i < text.length; i++) {
- if (numberRegex.exec(text[i])) {
+ var matchPart = pattern ? text[i].match(pattern) : null;
+ if (matchPart && matchPart[0] != '') {
+ numPart.push(matchPart);
+ } else if (!pattern && numberRegex.exec(text[i])) {
numPart.push(text[i]);
} else {
textPart.push(text[i]);
@@ -4664,8 +4983,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
return anum - bnum;
}
- numPart.sort(compareFn);
- textPart.sort(compareFn);
+ function comparePatternFn(a, b) {
+ if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
+ if (ignoreCase) { a[0] = a[0].toLowerCase(); b[0] = b[0].toLowerCase(); }
+ return (a[0] < b[0]) ? -1 : 1;
+ }
+ numPart.sort(pattern ? comparePatternFn : compareFn);
+ if (pattern) {
+ for (var i = 0; i < numPart.length; i++) {
+ numPart[i] = numPart[i].input;
+ }
+ } else if (!number) { textPart.sort(compareFn); }
text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
if (unique) { // Remove duplicate lines
var textOld = text;
@@ -4734,13 +5062,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
'any other getSearchCursor implementation.');
}
var argString = params.argString;
- var tokens = argString ? splitBySlash(argString) : [];
+ var tokens = argString ? splitBySeparator(argString, argString[0]) : [];
var regexPart, replacePart = '', trailing, flagsPart, count;
var confirm = false; // Whether to confirm each replace.
var global = false; // True to replace all instances on a line, false to replace only 1.
if (tokens.length) {
regexPart = tokens[0];
replacePart = tokens[1];
+ if (regexPart && regexPart[regexPart.length - 1] === '$') {
+ regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
+ replacePart = replacePart ? replacePart + '\n' : '\n';
+ }
if (replacePart !== undefined) {
if (getOption('pcre')) {
replacePart = unescapeRegexReplace(replacePart);
@@ -4769,7 +5101,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
global = true;
flagsPart.replace('g', '');
}
- regexPart = regexPart + '/' + flagsPart;
+ regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
}
}
if (regexPart) {
@@ -4806,13 +5138,20 @@ dom.importCssString(".normal-mode .ace_cursor{\
write: function(cm) {
if (CodeMirror.commands.save) {
CodeMirror.commands.save(cm);
- } else {
+ } else if (cm.save) {
cm.save();
}
},
nohlsearch: function(cm) {
clearSearchHighlight(cm);
},
+ yank: function (cm) {
+ var cur = copyCursor(cm.getCursor());
+ var line = cur.line;
+ var lineText = cm.getLine(line);
+ vimGlobalState.registerController.pushText(
+ '0', 'yank', lineText, true, true);
+ },
delmarks: function(cm, params) {
if (!params.argString || !trim(params.argString)) {
showConfirm(cm, 'Argument required');
@@ -4961,21 +5300,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
var isPlaying = macroModeState.isPlaying;
var lastChange = macroModeState.lastInsertModeChanges;
- var text = [];
if (!isPlaying) {
- var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
- var changes = lastChange.changes;
- var text = [];
- var i = 0;
- while (i < changes.length) {
- text.push(changes[i]);
- if (changes[i] instanceof InsertModeKey) {
- i++;
- } else {
- i+= selLength;
- }
- }
- lastChange.changes = text;
cm.off('change', onChange);
CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
}
@@ -4989,8 +5314,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
cm.setOption('keyMap', 'vim');
cm.setOption('disableInput', true);
-
- lastChange.overwrite = cm.state.overwrite;
cm.toggleOverwrite(false); // exit replace mode if we were in it.
insertModeChangeRegister.setText(lastChange.changes.join(''));
CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
@@ -5014,13 +5337,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
defineOption('insertModeEscKeysTimeout', 200, 'number');
CodeMirror.keyMap['vim-insert'] = {
- 'Ctrl-N': 'autocomplete',
- 'Ctrl-P': 'autocomplete',
- 'Enter': function(cm) {
- var fn = CodeMirror.commands.newlineAndIndentContinueComment ||
- CodeMirror.commands.newlineAndIndent;
- fn(cm);
- },
fallthrough: ['default'],
attach: attachVimMap,
detach: detachVimMap,
@@ -5094,20 +5410,31 @@ dom.importCssString(".normal-mode .ace_cursor{\
register.pushSearchQuery(query);
}
}
- function onChange(_cm, changeObj) {
+ function onChange(cm, changeObj) {
var macroModeState = vimGlobalState.macroModeState;
var lastChange = macroModeState.lastInsertModeChanges;
if (!macroModeState.isPlaying) {
while(changeObj) {
lastChange.expectCursorActivityForChange = true;
- if (changeObj.origin == '+input' || changeObj.origin == 'paste'
+ if (lastChange.ignoreCount > 1) {
+ lastChange.ignoreCount--;
+ } else if (changeObj.origin == '+input' || changeObj.origin == 'paste'
|| changeObj.origin === undefined /* only in testing */) {
+ var selectionCount = cm.listSelections().length;
+ if (selectionCount > 1)
+ lastChange.ignoreCount = selectionCount;
var text = changeObj.text.join('\n');
if (lastChange.maybeReset) {
lastChange.changes = [];
lastChange.maybeReset = false;
}
- lastChange.changes.push(text);
+ if (text) {
+ if (cm.state.overwrite && !/\n/.test(text)) {
+ lastChange.changes.push([text]);
+ } else {
+ lastChange.changes.push(text);
+ }
+ }
}
changeObj = changeObj.next;
}
@@ -5140,7 +5467,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
}
- function handleExternalSelection(cm, vim) {
+ function handleExternalSelection(cm, vim, keepHPos) {
var anchor = cm.getCursor('anchor');
var head = cm.getCursor('head');
if (vim.visualMode && !cm.somethingSelected()) {
@@ -5161,7 +5488,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
};
updateMark(cm, vim, '<', cursorMin(head, anchor));
updateMark(cm, vim, '>', cursorMax(head, anchor));
- } else if (!vim.insertMode) {
+ } else if (!vim.insertMode && !keepHPos) {
vim.lastHPos = cm.getCursor().ch;
}
}
@@ -5201,7 +5528,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
if (macroModeState.lastInsertModeChanges.changes.length > 0) {
repeat = !vim.lastEditActionCommand ? 1 : repeat;
var changeObject = macroModeState.lastInsertModeChanges;
- repeatInsertModeChanges(cm, changeObject.changes, repeat, changeObject.overwrite);
+ repeatInsertModeChanges(cm, changeObject.changes, repeat);
}
}
vim.inputState = vim.lastEditInputState;
@@ -5223,7 +5550,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
macroModeState.isPlaying = false;
}
- function repeatInsertModeChanges(cm, changes, repeat, overwrite) {
+ function repeatInsertModeChanges(cm, changes, repeat) {
function keyHandler(binding) {
if (typeof binding == 'string') {
CodeMirror.commands[binding](cm);
@@ -5233,34 +5560,31 @@ dom.importCssString(".normal-mode .ace_cursor{\
return true;
}
var head = cm.getCursor('head');
- var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
- if (inVisualBlock) {
- var vim = cm.state.vim;
- var lastSel = vim.lastSelection;
- var offset = getOffset(lastSel.anchor, lastSel.head);
- selectForInsert(cm, head, offset.line + 1);
+ var visualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.visualBlock;
+ if (visualBlock) {
+ selectForInsert(cm, head, visualBlock + 1);
repeat = cm.listSelections().length;
cm.setCursor(head);
}
for (var i = 0; i < repeat; i++) {
- if (inVisualBlock) {
+ if (visualBlock) {
cm.setCursor(offsetCursor(head, i, 0));
}
for (var j = 0; j < changes.length; j++) {
var change = changes[j];
if (change instanceof InsertModeKey) {
CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
- } else {
+ } else if (typeof change == "string") {
var cur = cm.getCursor();
- var end = cur;
- if (overwrite && !/\n/.test(change)) {
- end = offsetCursor(cur, 0, change.length);
- }
- cm.replaceRange(change, cur, end);
+ cm.replaceRange(change, cur, cur);
+ } else {
+ var start = cm.getCursor();
+ var end = offsetCursor(start, 0, change[0].length);
+ cm.replaceRange(change[0], start, end);
}
}
}
- if (inVisualBlock) {
+ if (visualBlock) {
cm.setCursor(offsetCursor(head, 0, 1));
}
}
@@ -5282,7 +5606,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
var name = '';
if (e.ctrlKey) { name += 'C-'; }
if (e.altKey) { name += 'A-'; }
- if (e.shiftKey) { name += 'S-'; }
+ if ((name || key.length > 1) && e.shiftKey) { name += 'S-'; }
name += key;
if (name.length > 1) { name = '<' + name + '>'; }
@@ -5316,15 +5640,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
var isHandled = false;
var vim = Vim.maybeInitVimState_(cm);
var visualBlock = vim.visualBlock || vim.wasInVisualBlock;
- if (vim.wasInVisualBlock && !cm.ace.inMultiSelectMode) {
+
+ var wasMultiselect = cm.ace.inMultiSelectMode;
+ if (vim.wasInVisualBlock && !wasMultiselect) {
vim.wasInVisualBlock = false;
- } else if (cm.ace.inMultiSelectMode && vim.visualBlock) {
+ } else if (wasMultiselect && vim.visualBlock) {
vim.wasInVisualBlock = true;
}
- if (key == '' && !vim.insertMode && !vim.visualMode && cm.ace.inMultiSelectMode) {
+ if (key == '' && !vim.insertMode && !vim.visualMode && wasMultiselect) {
cm.ace.exitMultiSelectMode();
- } else if (visualBlock || !cm.ace.inMultiSelectMode || cm.ace.inVirtualSelectionMode) {
+ } else if (visualBlock || !wasMultiselect || cm.ace.inVirtualSelectionMode) {
isHandled = Vim.handleKey(cm, key, origin);
} else {
var old = cloneVimState(vim);
@@ -5351,13 +5677,16 @@ dom.importCssString(".normal-mode .ace_cursor{\
cm.curOp.cursorActivity = false;
}, true);
}
+ if (isHandled && !vim.visualMode && !vim.insert && vim.visualMode != cm.somethingSelected()) {
+ handleExternalSelection(cm, vim, true);
+ }
return isHandled;
}
exports.CodeMirror = CodeMirror;
var getVim = Vim.maybeInitVimState_;
exports.handler = {
$id: "ace/keyboard/vim",
- drawCursor: function(style, pixelPos, config, sel, session) {
+ drawCursor: function(element, pixelPos, config, sel, session) {
var vim = this.state.vim || {};
var w = config.characterWidth;
var h = config.lineHeight;
@@ -5374,17 +5703,41 @@ dom.importCssString(".normal-mode .ace_cursor{\
h = h / 2;
top += h;
}
- style.left = left + "px";
- style.top = top + "px";
- style.width = w + "px";
- style.height = h + "px";
+ dom.translate(element, left, top);
+ dom.setStyle(element.style, "width", w + "px");
+ dom.setStyle(element.style, "height", h + "px");
},
handleKeyboard: function(data, hashId, key, keyCode, e) {
var editor = data.editor;
var cm = editor.state.cm;
var vim = getVim(cm);
if (keyCode == -1) return;
-
+ if (!vim.insertMode) {
+ if (hashId == -1) {
+ if (key.charCodeAt(0) > 0xFF) {
+ if (data.inputKey) {
+ key = data.inputKey;
+ if (key && data.inputHash == 4)
+ key = key.toUpperCase();
+ }
+ }
+ data.inputChar = key;
+ }
+ else if (hashId == 4 || hashId == 0) {
+ if (data.inputKey == key && data.inputHash == hashId && data.inputChar) {
+ key = data.inputChar;
+ hashId = -1
+ }
+ else {
+ data.inputChar = null;
+ data.inputKey = key;
+ data.inputHash = hashId;
+ }
+ }
+ else {
+ data.inputChar = data.inputKey = null;
+ }
+ }
if (key == "c" && hashId == 1) { // key == "ctrl-c"
if (!useragent.isMac && editor.getCopyText()) {
editor.once("copy", function() {
@@ -5392,11 +5745,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
});
return {command: "null", passEvent: true};
}
- } else if (!vim.insertMode) {
- if (useragent.isMac && this.handleMacRepeat(data, hashId, key)) {
- hashId = -1;
- key = data.inputChar;
- }
+ }
+
+ if (key == "esc" && !vim.insertMode && !vim.visualMode && !cm.ace.inMultiSelectMode) {
+ var searchState = getSearchState(cm);
+ var overlay = searchState.getOverlay();
+ if (overlay) cm.removeOverlay(overlay);
}
if (hashId == -1 || hashId & 1 || hashId === 0 && key.length > 1) {
@@ -5435,12 +5789,18 @@ dom.importCssString(".normal-mode .ace_cursor{\
});
cm.on("vim-mode-change", function() {
if (cm.virtualSelectionMode()) return;
- cm.ace.renderer.setStyle("normal-mode", !getVim(cm).insertMode);
+ updateInputMode();
cm._signal("changeStatus");
});
- cm.ace.renderer.setStyle("normal-mode", !getVim(cm).insertMode);
+ function updateInputMode() {
+ var isIntsert = getVim(cm).insertMode;
+ cm.ace.renderer.setStyle("normal-mode", !isIntsert);
+ editor.textInput.setCommandMode(!isIntsert);
+ editor.renderer.$keepTextAreaAtCursor = isIntsert;
+ editor.renderer.$blockCursor = !isIntsert;
+ }
+ updateInputMode();
editor.renderer.$cursorLayer.drawCursor = this.drawCursor.bind(cm);
- this.updateMacCompositionHandlers(editor, true);
},
detach: function(editor) {
var cm = editor.state.cm;
@@ -5450,7 +5810,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
editor.$vimModeHandler = null;
editor.renderer.$cursorLayer.drawCursor = null;
editor.renderer.setStyle("normal-mode", false);
- this.updateMacCompositionHandlers(editor, false);
+ editor.textInput.setCommandMode(false);
+ editor.renderer.$keepTextAreaAtCursor = true;
},
getStatusText: function(editor) {
var cm = editor.state.cm;
@@ -5468,77 +5829,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
if (vim.status)
status += (status ? " " : "") + vim.status;
return status;
- },
- handleMacRepeat: function(data, hashId, key) {
- if (hashId == -1) {
- data.inputChar = key;
- data.lastEvent = "input";
- } else if (data.inputChar && data.$lastHash == hashId && data.$lastKey == key) {
- if (data.lastEvent == "input") {
- data.lastEvent = "input1";
- } else if (data.lastEvent == "input1") {
- return true;
- }
- } else {
- data.$lastHash = hashId;
- data.$lastKey = key;
- data.lastEvent = "keypress";
- }
- },
- updateMacCompositionHandlers: function(editor, enable) {
- var onCompositionUpdateOverride = function(text) {
- var cm = editor.state.cm;
- var vim = getVim(cm);
- if (!vim.insertMode) {
- var el = this.textInput.getElement();
- el.blur();
- el.focus();
- el.value = text;
- } else {
- this.onCompositionUpdateOrig(text);
- }
- };
- var onCompositionStartOverride = function(text) {
- var cm = editor.state.cm;
- var vim = getVim(cm);
- if (!vim.insertMode) {
- this.onCompositionStartOrig(text);
- }
- };
- if (enable) {
- if (!editor.onCompositionUpdateOrig) {
- editor.onCompositionUpdateOrig = editor.onCompositionUpdate;
- editor.onCompositionUpdate = onCompositionUpdateOverride;
- editor.onCompositionStartOrig = editor.onCompositionStart;
- editor.onCompositionStart = onCompositionStartOverride;
- }
- } else {
- if (editor.onCompositionUpdateOrig) {
- editor.onCompositionUpdate = editor.onCompositionUpdateOrig;
- editor.onCompositionUpdateOrig = null;
- editor.onCompositionStart = editor.onCompositionStartOrig;
- editor.onCompositionStartOrig = null;
- }
- }
- }
- };
- var renderVirtualNumbers = {
- getText: function(session, row) {
- return (Math.abs(session.selection.lead.row - row) || (row + 1 + (row < 9? "\xb7" : "" ))) + "";
- },
- getWidth: function(session, lastLineNumber, config) {
- return session.getLength().toString().length * config.characterWidth;
- },
- update: function(e, editor) {
- editor.renderer.$loop.schedule(editor.renderer.CHANGE_GUTTER);
- },
- attach: function(editor) {
- editor.renderer.$gutterLayer.$renderer = this;
- editor.on("changeSelection", this.update);
- },
- detach: function(editor) {
- editor.renderer.$gutterLayer.$renderer = null;
- editor.off("changeSelection", this.update);
}
};
Vim.defineOption({
@@ -5593,6 +5883,11 @@ dom.importCssString(".normal-mode .ace_cursor{\
exports.handler.defaultKeymap = defaultKeymap;
exports.handler.actions = actions;
exports.Vim = Vim;
-
- Vim.map("Y", "yy", "normal");
-});
+}); (function() {
+ window.require(["ace/keyboard/vim"], function(m) {
+ if (typeof module == "object" && typeof exports == "object" && module) {
+ module.exports = m;
+ }
+ });
+ })();
+
\ No newline at end of file
diff --git a/chrome/content/scaffold/ace/theme-monokai.js b/chrome/content/scaffold/ace/theme-monokai.js
index b2f9df674f..ce64226bda 100644
--- a/chrome/content/scaffold/ace/theme-monokai.js
+++ b/chrome/content/scaffold/ace/theme-monokai.js
@@ -102,4 +102,11 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);
-});
+}); (function() {
+ window.require(["ace/theme/monokai"], function(m) {
+ if (typeof module == "object" && typeof exports == "object" && module) {
+ module.exports = m;
+ }
+ });
+ })();
+
\ No newline at end of file
diff --git a/chrome/content/scaffold/ace/worker-javascript.js b/chrome/content/scaffold/ace/worker-javascript.js
index 498b616d16..19f5058d5c 100644
--- a/chrome/content/scaffold/ace/worker-javascript.js
+++ b/chrome/content/scaffold/ace/worker-javascript.js
@@ -134,7 +134,7 @@ window.define = function(id, deps, factory) {
exports: {},
factory: function() {
var module = this;
- var returnExports = factory.apply(this, deps.map(function(dep) {
+ var returnExports = factory.apply(this, deps.slice(0, factory.length).map(function(dep) {
switch (dep) {
// Because "require", "exports" and "module" aren't actual
// dependencies, we must handle them seperately.
@@ -217,7 +217,7 @@ window.onmessage = function(e) {
};
})(this);
-define("ace/lib/oop",["require","exports","module"], function(require, exports, module) {
+define("ace/lib/oop",[], function(require, exports, module) {
"use strict";
exports.inherits = function(ctor, superCtor) {
@@ -245,7 +245,7 @@ exports.implement = function(proto, mixin) {
});
-define("ace/range",["require","exports","module"], function(require, exports, module) {
+define("ace/range",[], function(require, exports, module) {
"use strict";
var comparePoints = function(p1, p2) {
return p1.row - p2.row || p1.column - p2.column;
@@ -484,7 +484,7 @@ Range.comparePoints = function(p1, p2) {
exports.Range = Range;
});
-define("ace/apply_delta",["require","exports","module"], function(require, exports, module) {
+define("ace/apply_delta",[], function(require, exports, module) {
"use strict";
function throwDeltaError(delta, errorText){
@@ -549,7 +549,7 @@ exports.applyDelta = function(docLines, delta, doNotValidate) {
};
});
-define("ace/lib/event_emitter",["require","exports","module"], function(require, exports, module) {
+define("ace/lib/event_emitter",[], function(require, exports, module) {
"use strict";
var EventEmitter = {};
@@ -599,10 +599,15 @@ EventEmitter._signal = function(eventName, e) {
EventEmitter.once = function(eventName, callback) {
var _self = this;
- callback && this.addEventListener(eventName, function newCallback() {
+ this.addEventListener(eventName, function newCallback() {
_self.removeEventListener(eventName, newCallback);
callback.apply(null, arguments);
});
+ if (!callback) {
+ return new Promise(function(resolve) {
+ callback = resolve;
+ });
+ }
};
@@ -630,7 +635,6 @@ EventEmitter.removeDefaultHandler = function(eventName, callback) {
var disabled = handlers._disabled_[eventName];
if (handlers[eventName] == callback) {
- var old = handlers[eventName];
if (disabled)
this.setDefaultHandler(eventName, disabled.pop());
} else if (disabled) {
@@ -675,7 +679,7 @@ exports.EventEmitter = EventEmitter;
});
-define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"], function(require, exports, module) {
+define("ace/anchor",[], function(require, exports, module) {
"use strict";
var oop = require("./lib/oop");
@@ -800,7 +804,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
});
-define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"], function(require, exports, module) {
+define("ace/document",[], function(require, exports, module) {
"use strict";
var oop = require("./lib/oop");
@@ -1091,28 +1095,23 @@ var Document = function(textOrLines) {
return;
}
- if (isInsert && delta.lines.length > 20000)
+ if (isInsert && delta.lines.length > 20000) {
this.$splitAndapplyLargeDelta(delta, 20000);
- applyDelta(this.$lines, delta, doNotValidate);
- this._signal("change", delta);
+ }
+ else {
+ applyDelta(this.$lines, delta, doNotValidate);
+ this._signal("change", delta);
+ }
};
this.$splitAndapplyLargeDelta = function(delta, MAX) {
var lines = delta.lines;
- var l = lines.length;
+ var l = lines.length - MAX + 1;
var row = delta.start.row;
var column = delta.start.column;
- var from = 0, to = 0;
- do {
- from = to;
+ for (var from = 0, to = 0; from < l; from = to) {
to += MAX - 1;
var chunk = lines.slice(from, to);
- if (to > l) {
- delta.lines = chunk;
- delta.start.row = row + from;
- delta.start.column = column;
- break;
- }
chunk.push("");
this.applyDelta({
start: this.pos(row + from, column),
@@ -1120,7 +1119,11 @@ var Document = function(textOrLines) {
action: delta.action,
lines: chunk
}, true);
- } while(true);
+ }
+ delta.lines = lines.slice(from);
+ delta.start.row = row + from;
+ delta.start.column = column;
+ this.applyDelta(delta, true);
};
this.revertDelta = function(delta) {
this.applyDelta({
@@ -1138,7 +1141,7 @@ var Document = function(textOrLines) {
if (index < 0)
return {row: i, column: index + lines[i].length + newlineLength};
}
- return {row: l-1, column: lines[l-1].length};
+ return {row: l-1, column: index + lines[l-1].length + newlineLength};
};
this.positionToIndex = function(pos, startRow) {
var lines = this.$lines || this.getAllLines();
@@ -1156,7 +1159,7 @@ var Document = function(textOrLines) {
exports.Document = Document;
});
-define("ace/lib/lang",["require","exports","module"], function(require, exports, module) {
+define("ace/lib/lang",[], function(require, exports, module) {
"use strict";
exports.last = function(a) {
@@ -1258,7 +1261,7 @@ exports.escapeRegExp = function(str) {
};
exports.escapeHTML = function(str) {
- return str.replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/
-
+
@@ -198,10 +198,10 @@
-
+
-
+
&scaffold.testing.description;
diff --git a/chrome/content/scaffold/translators.js b/chrome/content/scaffold/translators.js
index b9a991beab..606e6579e1 100644
--- a/chrome/content/scaffold/translators.js
+++ b/chrome/content/scaffold/translators.js
@@ -22,52 +22,46 @@ var Scaffold_Translators = {
var dir = this.getDirectory();
var numLoaded = 0;
var deletedTranslators = new Set(this._translatorFiles.keys());
- await Zotero.File.iterateDirectory(dir, function* (iterator) {
- while (true) {
- let entries = yield iterator.nextBatch(50);
- if (!entries.length) break;
- for (let entry of entries) {
- if (entry.isDir || entry.name.startsWith('.') || !entry.name.endsWith('.js')) {
- continue;
- }
-
- deletedTranslators.delete(entry.name);
-
- try {
- let fmtime;
- if ('winLastWriteDate' in entry) {
- fmtime = entry.winLastWriteDate.getTime();
- }
- else {
- fmtime = (yield OS.File.stat(entry.path)).lastModificationDate.getTime();
- }
- let translatorID = this._translatorFiles.get(entry.name);
- let loadFile = true;
- // If translator is already loaded, see if mtime has changed
- if (translatorID) {
- let mtime = this._translators.get(translatorID).mtime;
- if (mtime == fmtime) {
- loadFile = false;
- }
- }
- if (loadFile) {
- let translator = yield Zotero.Translators.loadFromFile(entry.path);
- this._translators.set(
- translator.translatorID,
- {
- translator,
- filename: entry.name,
- mtime: fmtime,
- }
- );
- this._translatorFiles.set(entry.name, translator.translatorID);
- numLoaded++;
- }
- }
- catch (e) {
- Zotero.logError(e);
+ await Zotero.File.iterateDirectory(dir, async function (entry) {
+ if (entry.isDir || entry.name.startsWith('.') || !entry.name.endsWith('.js')) {
+ return;
+ }
+
+ deletedTranslators.delete(entry.name);
+
+ try {
+ let fmtime;
+ if ('winLastWriteDate' in entry) {
+ fmtime = entry.winLastWriteDate.getTime();
+ }
+ else {
+ fmtime = (await OS.File.stat(entry.path)).lastModificationDate.getTime();
+ }
+ let translatorID = this._translatorFiles.get(entry.name);
+ let loadFile = true;
+ // If translator is already loaded, see if mtime has changed
+ if (translatorID) {
+ let mtime = this._translators.get(translatorID).mtime;
+ if (mtime == fmtime) {
+ loadFile = false;
}
}
+ if (loadFile) {
+ let translator = await Zotero.Translators.loadFromFile(entry.path);
+ this._translators.set(
+ translator.translatorID,
+ {
+ translator,
+ filename: entry.name,
+ mtime: fmtime,
+ }
+ );
+ this._translatorFiles.set(entry.name, translator.translatorID);
+ numLoaded++;
+ }
+ }
+ catch (e) {
+ Zotero.logError(e);
}
}.bind(this));
diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index e2bb79e24f..d457d308ff 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -1,12 +1,3 @@
-#zotero-splitter
-{
- border-top: none;
- border-bottom: 1px solid #A3A3A3;
- min-height: 1px !important;
- max-height: 1px !important;
- background-image: none;
-}
-
#zotero-items-toolbar[state=collapsed]
{
margin-left: -8px !important;
@@ -107,11 +98,6 @@
padding: 2px 0px 2px 8px !important;
}
-#zotero-close-button {
- margin: 0px !important;
- padding: 0px 0px 0px 10px !important;
-}
-
#zotero-tb-sync {
margin: 0;
}
diff --git a/chrome/content/zotero-platform/mac/panebutton-active.png b/chrome/content/zotero-platform/mac/panebutton-active.png
new file mode 100644
index 0000000000..ca241c7b8a
Binary files /dev/null and b/chrome/content/zotero-platform/mac/panebutton-active.png differ
diff --git a/chrome/content/zotero-platform/mac/panebutton-inactive.png b/chrome/content/zotero-platform/mac/panebutton-inactive.png
new file mode 100644
index 0000000000..de527b6627
Binary files /dev/null and b/chrome/content/zotero-platform/mac/panebutton-inactive.png differ
diff --git a/chrome/content/zotero-platform/mac/preferences.css b/chrome/content/zotero-platform/mac/preferences.css
new file mode 100644
index 0000000000..e2f6430eb4
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/preferences.css
@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+prefwindow,
+prefwindow:root /* override :root from above */ {
+ -moz-binding: url("chrome://zotero/content/bindings/preferences-mac.xml#prefwindow");
+ -moz-box-orient: vertical;
+}
+
+prefpane {
+ -moz-binding: url("chrome://zotero/content/bindings/preferences-mac.xml#prefpane");
+ -moz-box-orient: vertical;
+}
+
+prefwindow > .paneDeckContainer {
+ overflow: hidden;
+}
+
+prefpane > .content-box {
+ overflow: hidden;
+}
+
+prefwindow[type="child"] > .paneDeckContainer {
+ overflow: -moz-hidden-unscrollable;
+}
+
+prefwindow[type="child"] > prefpane > .content-box {
+ -moz-box-flex: 1;
+ overflow: -moz-hidden-unscrollable;
+}
+
+preferences {
+ -moz-binding: url("chrome://zotero/content/bindings/preferences-mac.xml#preferences");
+ visibility: collapse;
+}
+
+preference {
+ -moz-binding: url("chrome://zotero/content/bindings/preferences-mac.xml#preference");
+ visibility: collapse;
+}
+
+radio[pane] {
+ -moz-binding: url("chrome://zotero/content/bindings/preferences-mac.xml#panebutton") !important;
+ -moz-box-orient: vertical;
+ -moz-box-align: center;
+}
+
+prefwindow[chromehidden~="toolbar"] .chromeclass-toolbar {
+ display: none;
+}
+
+
+prefwindow {
+ padding: 0;
+ font: -moz-dialog !important;
+
+ -moz-appearance: dialog;
+ color: -moz-DialogText;
+}
+
+prefpane {
+ padding: 12px 12px 0 12px;
+}
+
+prefwindow[type="child"] > prefpane {
+ padding: 0;
+}
+
+.prefWindow-dlgbuttons {
+ margin: 0 12px 12px;
+ padding-top: 0 !important;
+}
+
+.paneSelector {
+ font: message-box;
+ padding: 1px 4px;
+ -moz-appearance: toolbar;
+ margin: 0;
+}
+
+radio[pane] {
+ border: solid transparent;
+ border-width: 0 2px;
+ padding: 5px 4px 3px;
+ margin: 0;
+ -moz-appearance: none;
+ text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
+}
+
+radio[pane]:active:hover {
+ text-shadow: none;
+}
+
+radio[pane]:active:hover > .paneButtonIcon {
+ filter: brightness(0.55);
+}
+
+radio[pane][selected="true"] {
+ -moz-border-image: url("chrome://zotero-platform/content/panebutton-active.png") 0 2 fill repeat stretch;
+}
+
+radio[pane][selected="true"]:-moz-window-inactive {
+ -moz-border-image: url("chrome://zotero-platform/content/panebutton-inactive.png") 0 2 fill repeat stretch;
+}
+
+.paneButtonLabel {
+ margin: 0 !important;
+}
+
+groupbox {
+ padding: 5px 1px 1px;
+ padding-inline-start: 0;
+ margin: 6px;
+}
+
+.groupbox-title {
+ border-bottom: #b5b5b5 1px solid;
+}
+
+.groupbox-body {
+ -moz-appearance: groupbox;
+ padding: 8px 8px 3px;
+ margin: 0;
+}
+
+caption {
+ padding-inline-start: 4px;
+ padding-bottom: 1px;
+ font: caption;
+}
+
+/* !important is needed to override label in global.css */
+.caption-text {
+ margin-top: 0 !important;
+ margin-bottom: 0 !important;
+ margin-inline-start: 1px !important;
+}
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
index 1371c55807..a02c917273 100644
--- a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
+++ b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
@@ -124,7 +124,7 @@
-