|
|
@@ -1,1758 +1,5320 @@
|
|
|
-ace.define("ace/keyboard/vim/registers",["require","exports","module"], function(require, exports, module) {
|
|
|
+ace.define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/dom","ace/lib/oop","ace/lib/keys","ace/lib/event","ace/search","ace/lib/useragent","ace/search_highlight","ace/commands/multi_select_commands","ace/multi_select"], function(require, exports, module) {
|
|
|
+ 'use strict';
|
|
|
|
|
|
-"never use strict";
|
|
|
+ function log() {
|
|
|
+ var d = "";
|
|
|
+ function format(p) {
|
|
|
+ if (typeof p != "object")
|
|
|
+ return p + ""
|
|
|
+ if ("line" in p) {
|
|
|
+ return p.line + ":" + p.ch
|
|
|
+ }
|
|
|
+ if ("anchor" in p) {
|
|
|
+ return format(p.anchor) + "->" + format(p.head)
|
|
|
+ }
|
|
|
+ if (Array.isArray(p))
|
|
|
+ return "[" + p.map(function(x) {return format(x)})+"]"
|
|
|
+ return JSON.stringify(p)
|
|
|
+ }
|
|
|
+ for (var i = 0; i < arguments.length; i++) {
|
|
|
+ var p = arguments[i]
|
|
|
+ var f = format(p)
|
|
|
+ d+= f+" "
|
|
|
+ }
|
|
|
+ console.log(d)
|
|
|
+ }
|
|
|
+ var Range = require("../range").Range;
|
|
|
+ var EventEmitter = require("../lib/event_emitter").EventEmitter;
|
|
|
+ var dom = require("../lib/dom");
|
|
|
+ var oop = require("../lib/oop");
|
|
|
+ var KEYS = require("../lib/keys");
|
|
|
+ var event = require("../lib/event");
|
|
|
+ var Search = require("../search").Search;
|
|
|
+ var useragent = require("../lib/useragent");
|
|
|
+ var SearchHighlight = require("../search_highlight").SearchHighlight;
|
|
|
+ var multiSelectCommands = require("../commands/multi_select_commands");
|
|
|
+ require("../multi_select");
|
|
|
+
|
|
|
+ var CodeMirror = function(ace) {
|
|
|
+ this.ace = ace;
|
|
|
+ this.state = {};
|
|
|
+ this.marks = {};
|
|
|
+ this.$uid = 0;
|
|
|
+ this.onChange = this.onChange.bind(this);
|
|
|
+ this.onSelectionChange = this.onSelectionChange.bind(this);
|
|
|
+ this.onBeforeEndOperation = this.onBeforeEndOperation.bind(this);
|
|
|
+ this.ace.on('change', this.onChange);
|
|
|
+ this.ace.on('changeSelection', this.onSelectionChange);
|
|
|
+ this.ace.on('beforeEndOperation', this.onBeforeEndOperation);
|
|
|
+ };
|
|
|
+ CodeMirror.Pos = function(line, ch) {
|
|
|
+ if (!(this instanceof Pos)) return new Pos(line, ch);
|
|
|
+ this.line = line; this.ch = ch;
|
|
|
+ };
|
|
|
+ CodeMirror.defineOption = function(name, val, setter) {};
|
|
|
+ CodeMirror.commands = {
|
|
|
+ redo: function(cm) { cm.ace.redo(); },
|
|
|
+ undo: function(cm) { cm.ace.undo(); },
|
|
|
+ newlineAndIndent: function(cm) { cm.ace.insert("\n"); },
|
|
|
+ };
|
|
|
+ CodeMirror.keyMap = {};
|
|
|
+ CodeMirror.addClass = CodeMirror.rmClass =
|
|
|
+ CodeMirror.e_stop = function() {};
|
|
|
+ CodeMirror.keyName = function(e) {
|
|
|
+ if (e.key) return e.key;
|
|
|
+ var key = (KEYS[e.keyCode] || "");
|
|
|
+ if (key.length == 1) key = key.toUpperCase();
|
|
|
+ key = event.getModifierString(e).replace(/(^|-)\w/g, function(m) {
|
|
|
+ return m.toUpperCase();
|
|
|
+ }) + key;
|
|
|
+ return key;
|
|
|
+ };
|
|
|
+ CodeMirror.keyMap['default'] = function(key) {
|
|
|
+ return function(cm) {
|
|
|
+ var cmd = cm.ace.commands.commandKeyBinding[key.toLowerCase()];
|
|
|
+ return cmd && cm.ace.execCommand(cmd) !== false;
|
|
|
+ };
|
|
|
+ };
|
|
|
+ CodeMirror.lookupKey = function lookupKey(key, map, handle) {
|
|
|
+ if (typeof map == "string")
|
|
|
+ map = CodeMirror.keyMap[map];
|
|
|
+ var found = typeof map == "function" ? map(key) : map[key];
|
|
|
+ if (found === false) return "nothing";
|
|
|
+ if (found === "...") return "multi";
|
|
|
+ if (found != null && handle(found)) return "handled";
|
|
|
|
|
|
-module.exports = {
|
|
|
- _default: {
|
|
|
- text: "",
|
|
|
- isLine: false
|
|
|
+ if (map.fallthrough) {
|
|
|
+ if (!Array.isArray(map.fallthrough))
|
|
|
+ return lookupKey(key, map.fallthrough, handle);
|
|
|
+ for (var i = 0; i < map.fallthrough.length; i++) {
|
|
|
+ var result = lookupKey(key, map.fallthrough[i], handle);
|
|
|
+ if (result) return result;
|
|
|
+ }
|
|
|
}
|
|
|
-};
|
|
|
+ };
|
|
|
|
|
|
-});
|
|
|
+ CodeMirror.signal = function(o, name, e) { return o._signal(name, e) };
|
|
|
+ CodeMirror.on = event.addListener;
|
|
|
+ CodeMirror.off = event.removeListener;
|
|
|
+(function() {
|
|
|
+ oop.implement(CodeMirror.prototype, EventEmitter);
|
|
|
+
|
|
|
+ this.destroy = function() {
|
|
|
+ this.ace.off('change', this.onChange);
|
|
|
+ this.ace.off('changeSelection', this.onSelectionChange);
|
|
|
+ this.ace.off('beforeEndOperation', this.onBeforeEndOperation);
|
|
|
+ this.removeOverlay();
|
|
|
+ };
|
|
|
+ this.virtualSelectionMode = function() {
|
|
|
+ return this.ace.inVirtualSelectionMode && this.ace.selection.index
|
|
|
+ };
|
|
|
+ this.onChange = function(delta) {
|
|
|
+ var oldDelta = delta.data;
|
|
|
+ delta = {
|
|
|
+ start: oldDelta.range.start,
|
|
|
+ end: oldDelta.range.end,
|
|
|
+ action: oldDelta.action,
|
|
|
+ lines: oldDelta.lines || [oldDelta.text]
|
|
|
+ };// v1.2 api compatibility
|
|
|
+ if (delta.action[0] == 'i') {
|
|
|
+ var change = { text: delta.lines };
|
|
|
+ var curOp = this.curOp = this.curOp || {};
|
|
|
+ if (!curOp.changeHandlers)
|
|
|
+ curOp.changeHandlers = this._eventRegistry["change"] && this._eventRegistry["change"].slice();
|
|
|
+ if (this.virtualSelectionMode()) return;
|
|
|
+ if (!curOp.lastChange) {
|
|
|
+ curOp.lastChange = curOp.change = change;
|
|
|
+ } else {
|
|
|
+ curOp.lastChange.next = curOp.lastChange = change;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.$updateMarkers(delta);
|
|
|
+ };
|
|
|
+ this.onSelectionChange = function() {
|
|
|
+ var curOp = this.curOp = this.curOp || {};
|
|
|
+ if (!curOp.cursorActivityHandlers)
|
|
|
+ curOp.cursorActivityHandlers = this._eventRegistry["cursorActivity"] && this._eventRegistry["cursorActivity"].slice();
|
|
|
+ this.curOp.cursorActivity = true;
|
|
|
+ if (this.ace.inMultiSelectMode) {
|
|
|
+ this.ace.keyBinding.removeKeyboardHandler(multiSelectCommands.keyboardHandler);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.operation = function(fn, force) {
|
|
|
+ if (!force && this.curOp || force && this.curOp && this.curOp.force) {
|
|
|
+ return fn();
|
|
|
+ }
|
|
|
+ if (force || !this.ace.curOp) {
|
|
|
+ if (this.curOp)
|
|
|
+ this.onBeforeEndOperation();
|
|
|
+ }
|
|
|
+ if (!this.ace.curOp) {
|
|
|
+ var prevOp = this.ace.prevOp;
|
|
|
+ this.ace.startOperation({
|
|
|
+ command: { name: "vim", scrollIntoView: "cursor" }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ var curOp = this.curOp = this.curOp || {};
|
|
|
+ this.curOp.force = force;
|
|
|
+ var result = fn();
|
|
|
+ if (this.ace.curOp && this.ace.curOp.command.name == "vim") {
|
|
|
+ this.ace.endOperation();
|
|
|
+ if (!curOp.cursorActivity && !curOp.lastChange && prevOp)
|
|
|
+ this.ace.prevOp = prevOp;
|
|
|
+ }
|
|
|
+ if (force || !this.ace.curOp) {
|
|
|
+ if (this.curOp)
|
|
|
+ this.onBeforeEndOperation();
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+ };
|
|
|
+ this.onBeforeEndOperation = function() {
|
|
|
+ var op = this.curOp;
|
|
|
+ if (op) {
|
|
|
+ if (op.change) { this.signal("change", op.change, op); }
|
|
|
+ if (op && op.cursorActivity) { this.signal("cursorActivity", null, op); }
|
|
|
+ this.curOp = null;
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
-ace.define("ace/keyboard/vim/maps/util",["require","exports","module","ace/keyboard/vim/registers","ace/lib/dom"], function(require, exports, module) {
|
|
|
-var registers = require("../registers");
|
|
|
+ this.signal = function(eventName, e, handlers) {
|
|
|
+ var listeners = handlers ? handlers[eventName + "Handlers"]
|
|
|
+ : (this._eventRegistry || {})[eventName];
|
|
|
+ if (!listeners)
|
|
|
+ return;
|
|
|
+ listeners = listeners.slice();
|
|
|
+ for (var i=0; i<listeners.length; i++)
|
|
|
+ listeners[i](this, e);
|
|
|
+ };
|
|
|
+ this.firstLine = function() { return 0; };
|
|
|
+ this.lastLine = function() { return this.ace.session.getLength() - 1; };
|
|
|
+ this.lineCount = function() { return this.ace.session.getLength(); };
|
|
|
+ this.setCursor = function(line, ch) {
|
|
|
+ if (typeof line === 'object') {
|
|
|
+ ch = line.ch;
|
|
|
+ line = line.line;
|
|
|
+ }
|
|
|
+ if (!this.ace.inVirtualSelectionMode)
|
|
|
+ this.ace.exitMultiSelectMode();
|
|
|
+ this.ace.selection.moveTo(line, ch);
|
|
|
+ };
|
|
|
+ this.getCursor = function(p) {
|
|
|
+ var sel = this.ace.selection;
|
|
|
+ var pos = p == 'anchor' ? (sel.isEmpty() ? sel.lead : sel.anchor) :
|
|
|
+ p == 'head' || !p ? sel.lead : sel.getRange()[p];
|
|
|
+ return toCmPos(pos);
|
|
|
+ };
|
|
|
+ this.listSelections = function(p) {
|
|
|
+ var ranges = this.ace.multiSelect.rangeList.ranges;
|
|
|
+ if (!ranges.length || this.ace.inVirtualSelectionMode)
|
|
|
+ return [{anchor: this.getCursor('anchor'), head: this.getCursor('head')}];
|
|
|
+ return ranges.map(function(r) {
|
|
|
+ return {
|
|
|
+ anchor: this.clipPos(toCmPos(r.cursor == r.end ? r.start : r.end)),
|
|
|
+ head: this.clipPos(toCmPos(r.cursor))
|
|
|
+ };
|
|
|
+ }, this);
|
|
|
+ };
|
|
|
+ this.setSelections = function(p, primIndex) {
|
|
|
+ var sel = this.ace.multiSelect;
|
|
|
+ var ranges = p.map(function(x) {
|
|
|
+ var anchor = toAcePos(x.anchor);
|
|
|
+ var head = toAcePos(x.head);
|
|
|
+ var r = Range.comparePoints(anchor, head) < 0
|
|
|
+ ? new Range.fromPoints(anchor, head)
|
|
|
+ : new Range.fromPoints(head, anchor);
|
|
|
+ r.cursor = Range.comparePoints(r.start, head) ? r.end : r.start;
|
|
|
+ return r;
|
|
|
+ });
|
|
|
+
|
|
|
+ if (this.ace.inVirtualSelectionMode) {
|
|
|
+ this.ace.selection.fromOrientedRange(ranges[0]);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (!primIndex) {
|
|
|
+ ranges = ranges.reverse();
|
|
|
+ } else if (ranges[primIndex]) {
|
|
|
+ ranges.push(ranges.splice(primIndex, 1)[0]);
|
|
|
+ }
|
|
|
+ sel.toSingleRange(ranges[0].clone());
|
|
|
+ var session = this.ace.session;
|
|
|
+ for (var i = 0; i < ranges.length; i++) {
|
|
|
+ var range = session.$clipRangeToDocument(ranges[i]); // todo why ace doesn't do this?
|
|
|
+ sel.addRange(range);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.setSelection = function(a, h, options) {
|
|
|
+ var sel = this.ace.selection;
|
|
|
+ sel.moveTo(a.line, a.ch);
|
|
|
+ sel.selectTo(h.line, h.ch);
|
|
|
+ if (options && options.origin == '*mouse') {
|
|
|
+ this.onBeforeEndOperation();
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.somethingSelected = function(p) {
|
|
|
+ return !this.ace.selection.isEmpty();
|
|
|
+ };
|
|
|
+ this.clipPos = function(p) {
|
|
|
+ var pos = this.ace.session.$clipPositionToDocument(p.line, p.ch);
|
|
|
+ return toCmPos(pos);
|
|
|
+ };
|
|
|
+ this.markText = function(cursor) {
|
|
|
+ return {clear: function() {}, find: function() {}};
|
|
|
+ };
|
|
|
+ this.$updateMarkers = function(delta) {
|
|
|
+ var isInsert = delta.action == "insert";
|
|
|
+ var start = delta.start;
|
|
|
+ var end = delta.end;
|
|
|
+ var rowShift = (end.row - start.row) * (isInsert ? 1 : -1);
|
|
|
+ var colShift = (end.column - start.column) * (isInsert ? 1 : -1);
|
|
|
+ if (isInsert) end = start;
|
|
|
+
|
|
|
+ for (var i in this.marks) {
|
|
|
+ var point = this.marks[i];
|
|
|
+ var cmp = Range.comparePoints(point, start);
|
|
|
+ if (cmp < 0) {
|
|
|
+ continue; // delta starts after the range
|
|
|
+ }
|
|
|
+ if (cmp === 0) {
|
|
|
+ if (isInsert) {
|
|
|
+ if (point.bias == 1) {
|
|
|
+ cmp = 1;
|
|
|
+ } else {
|
|
|
+ point.bias == -1;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var cmp2 = isInsert ? cmp : Range.comparePoints(point, end);
|
|
|
+ if (cmp2 > 0) {
|
|
|
+ point.row += rowShift;
|
|
|
+ point.column += point.row == end.row ? colShift : 0;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (!isInsert && cmp2 <= 0) {
|
|
|
+ point.row = start.row;
|
|
|
+ point.column = start.column;
|
|
|
+ if (cmp2 === 0)
|
|
|
+ point.bias = 1
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ var Marker = function(cm, id, row, column) {
|
|
|
+ this.cm = cm;
|
|
|
+ this.id = id;
|
|
|
+ this.row = row;
|
|
|
+ this.column = column;
|
|
|
+ cm.marks[this.id] = this;
|
|
|
+ };
|
|
|
+ Marker.prototype.clear = function() { delete this.cm.marks[this.id] };
|
|
|
+ Marker.prototype.find = function() { return toCmPos(this) };
|
|
|
+ this.setBookmark = function(cursor, options) {
|
|
|
+ var bm = new Marker(this, this.$uid++, cursor.line, cursor.ch);
|
|
|
+ if (!options || !options.insertLeft)
|
|
|
+ bm.$insertRight = true;
|
|
|
+ this.marks[bm.id] = bm;
|
|
|
+ return bm;
|
|
|
+ };
|
|
|
+ this.moveH = function(increment, unit) {
|
|
|
+ if (unit == 'char') {
|
|
|
+ var sel = this.ace.selection;
|
|
|
+ sel.clearSelection();
|
|
|
+ sel.moveCursorBy(0, increment);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.findPosV = function(start, amaount, unit, goalColumn) {
|
|
|
+ if (unit == 'line') {
|
|
|
+ var screenPos = this.ace.session.documentToScreenPosition(start.line, start.ch);
|
|
|
+ if (goalColumn != null)
|
|
|
+ screenPos.column = goalColumn;
|
|
|
+ screenPos.row += amaount;
|
|
|
+ screenPos.row = Math.min(Math.max(0, screenPos.row), this.ace.session.getScreenLength() - 1);
|
|
|
+ var pos = this.ace.session.screenToDocumentPosition(screenPos.row, screenPos.column);
|
|
|
+ return toCmPos(pos);
|
|
|
+ } else {
|
|
|
+ debugger;
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.charCoords = function(pos, mode) {
|
|
|
+ if (mode == 'div' || !mode) {
|
|
|
+ var sc = this.ace.session.documentToScreenPosition(pos.line, pos.ch);
|
|
|
+ return {left: sc.column, top: sc.row};
|
|
|
+ }if (mode == 'local') {
|
|
|
+ var renderer = this.ace.renderer;
|
|
|
+ var sc = this.ace.session.documentToScreenPosition(pos.line, pos.ch);
|
|
|
+ var lh = renderer.layerConfig.lineHeight;
|
|
|
+ var cw = renderer.layerConfig.characterWidth;
|
|
|
+ var top = lh * sc.row;
|
|
|
+ return {left: sc.column * cw, top: top, bottom: top + lh};
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.coordsChar = function(pos, mode) {
|
|
|
+ var renderer = this.ace.renderer;
|
|
|
+ if (mode == 'local') {
|
|
|
+ var row = Math.max(0, Math.floor(pos.top / renderer.lineHeight));
|
|
|
+ var col = Math.max(0, Math.floor(pos.left / renderer.characterWidth));
|
|
|
+ var ch = renderer.session.screenToDocumentPosition(row, col);
|
|
|
+ return toCmPos(ch);
|
|
|
+ } else if (mode == 'div') {
|
|
|
+ throw "not implemented";
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.openDialog = function() {
|
|
|
+ debugger
|
|
|
+ };
|
|
|
+ this.getSearchCursor = function(query, pos, caseFold) {
|
|
|
+ var caseSensitive = false;
|
|
|
+ var isRegexp = false;
|
|
|
+ if (query instanceof RegExp && !query.global) {
|
|
|
+ caseSensitive = !query.ignoreCase;
|
|
|
+ query = query.source;
|
|
|
+ isRegexp = true;
|
|
|
+ }
|
|
|
+ var search = new Search();
|
|
|
+ if (pos.ch == undefined) pos.ch = Number.MAX_VALUE;
|
|
|
+ var acePos = {row: pos.line, column: pos.ch};
|
|
|
+ var cm = this;
|
|
|
+ var last = null;
|
|
|
+ return {
|
|
|
+ findNext: function() { return this.find(false) },
|
|
|
+ findPrevious: function() {return this.find(true) },
|
|
|
+ find: function(back) {
|
|
|
+ search.setOptions({
|
|
|
+ needle: query,
|
|
|
+ caseSensitive: caseSensitive,
|
|
|
+ wrap: false,
|
|
|
+ backwards: back,
|
|
|
+ regExp: isRegexp,
|
|
|
+ start: last || acePos
|
|
|
+ });
|
|
|
+ var range = search.find(cm.ace.session);
|
|
|
+ if (range && range.isEmpty()) {
|
|
|
+ if (cm.getLine(range.start.row).length == range.start.column) {
|
|
|
+ search.$options.start = range;
|
|
|
+ range = search.find(cm.ace.session);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ last = range;
|
|
|
+ return last;
|
|
|
+ },
|
|
|
+ from: function() { return last && toCmPos(last.start) },
|
|
|
+ to: function() { return last && toCmPos(last.end) },
|
|
|
+ replace: function(text) {
|
|
|
+ if (last) {
|
|
|
+ last.end = cm.ace.session.doc.replace(last, text);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ };
|
|
|
+ this.scrollTo = function(x, y) {
|
|
|
+ var renderer = this.ace.renderer;
|
|
|
+ var config = renderer.layerConfig;
|
|
|
+ var maxHeight = config.maxHeight;
|
|
|
+ maxHeight -= (renderer.$size.scrollerHeight - renderer.lineHeight) * renderer.$scrollPastEnd;
|
|
|
+ if (y != null) this.ace.session.setScrollTop(Math.max(0, Math.min(y, maxHeight)));
|
|
|
+ if (x != null) this.ace.session.setScrollLeft(Math.max(0, Math.min(x, config.width)));
|
|
|
+ };
|
|
|
+ this.scrollInfo = function() { return 0; };
|
|
|
+ this.scrollIntoView = function(pos, margin) {
|
|
|
+ if (pos)
|
|
|
+ this.ace.renderer.scrollCursorIntoView(toAcePos(pos), null, margin);
|
|
|
+ };
|
|
|
+ this.getLine = function(row) { return this.ace.session.getLine(row) };
|
|
|
+ this.getRange = function(s, e) {
|
|
|
+ return this.ace.session.getTextRange(new Range(s.line, s.ch, e.line, e.ch));
|
|
|
+ };
|
|
|
+ this.replaceRange = function(text, s, e) {
|
|
|
+ if (!e) e = s;
|
|
|
+ return this.ace.session.replace(new Range(s.line, s.ch, e.line, e.ch), text);
|
|
|
+ };
|
|
|
+ this.replaceSelections = function(p) {
|
|
|
+ var sel = this.ace.selection;
|
|
|
+ if (this.ace.inVirtualSelectionMode) {
|
|
|
+ this.ace.session.replace(sel.getRange(), p[0] || "");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ sel.inVirtualSelectionMode = true;
|
|
|
+ var ranges = sel.rangeList.ranges;
|
|
|
+ if (!ranges.length) ranges = [this.ace.multiSelect.getRange()];
|
|
|
+ for (var i = ranges.length; i--;)
|
|
|
+ this.ace.session.replace(ranges[i], p[i] || "");
|
|
|
+ sel.inVirtualSelectionMode = false;
|
|
|
+ };
|
|
|
+ this.getSelection = function() {
|
|
|
+ return this.ace.getSelectedText();
|
|
|
+ };
|
|
|
+ this.getSelections = function() {
|
|
|
+ return this.listSelections().map(function(x) {
|
|
|
+ return this.getRange(x.anchor, x.head);
|
|
|
+ }, this);
|
|
|
+ };
|
|
|
+ this.getInputField = function() {
|
|
|
+ return this.ace.textInput.getElement();
|
|
|
+ };
|
|
|
+ this.getWrapperElement = function() {
|
|
|
+ return this.ace.containter;
|
|
|
+ };
|
|
|
+ var optMap = {
|
|
|
+ indentWithTabs: "useSoftTabs",
|
|
|
+ indentUnit: "tabSize",
|
|
|
+ firstLineNumber: "firstLineNumber"
|
|
|
+ };
|
|
|
+ this.setOption = function(name, val) {
|
|
|
+ this.state[name] = val;
|
|
|
+ switch (name) {
|
|
|
+ case 'indentWithTabs':
|
|
|
+ name = optMap[name];
|
|
|
+ val = !val;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ name = optMap[name];
|
|
|
+ }
|
|
|
+ if (name)
|
|
|
+ this.ace.setOption(name, val);
|
|
|
+ };
|
|
|
+ this.getOption = function(name, val) {
|
|
|
+ var aceOpt = optMap[name];
|
|
|
+ if (aceOpt)
|
|
|
+ val = this.ace.getOption(aceOpt);
|
|
|
+ switch (name) {
|
|
|
+ case 'indentWithTabs':
|
|
|
+ name = optMap[name];
|
|
|
+ return !val;
|
|
|
+ }
|
|
|
+ return aceOpt ? val : this.state[name];
|
|
|
+ };
|
|
|
+ this.toggleOverwrite = function(on) {
|
|
|
+ this.state.overwrite = on;
|
|
|
+ return this.ace.setOverwrite(on);
|
|
|
+ };
|
|
|
+ this.addOverlay = function(o) {
|
|
|
+ if (!this.$searchHighlight || !this.$searchHighlight.session) {
|
|
|
+ var highlight = new SearchHighlight(null, "ace_highlight-marker", "text");
|
|
|
+ var marker = this.ace.session.addDynamicMarker(highlight);
|
|
|
+ highlight.id = marker.id;
|
|
|
+ highlight.session = this.ace.session;
|
|
|
+ highlight.destroy = function(o) {
|
|
|
+ highlight.session.off("change", highlight.updateOnChange);
|
|
|
+ highlight.session.off("changeEditor", highlight.destroy);
|
|
|
+ highlight.session.removeMarker(highlight.id);
|
|
|
+ highlight.session = null;
|
|
|
+ };
|
|
|
+ highlight.updateOnChange = function(delta) {
|
|
|
+ delta = delta.data.range;// v1.2 api compatibility
|
|
|
+ var row = delta.start.row;
|
|
|
+ if (row == delta.end.row) highlight.cache[row] = undefined;
|
|
|
+ else highlight.cache.splice(row, highlight.cache.length);
|
|
|
+ }
|
|
|
+ highlight.session.on("changeEditor", highlight.destroy);
|
|
|
+ highlight.session.on("change", highlight.updateOnChange);
|
|
|
+ }
|
|
|
+ var re = new RegExp(o.query.source, "gmi");
|
|
|
+ console.log(re)
|
|
|
+ this.$searchHighlight = o.highlight = highlight;
|
|
|
+ this.$searchHighlight.setRegexp(re);
|
|
|
+ this.ace.renderer.updateBackMarkers();
|
|
|
+ };
|
|
|
+ this.removeOverlay = function(o) {
|
|
|
+ if (this.$searchHighlight && this.$searchHighlight.session) {
|
|
|
+ this.$searchHighlight.destroy();
|
|
|
+ }
|
|
|
+ };
|
|
|
+ this.getScrollInfo = function() {
|
|
|
+ var renderer = this.ace.renderer;
|
|
|
+ var config = renderer.layerConfig;
|
|
|
+ return {
|
|
|
+ left: renderer.scrollLeft,
|
|
|
+ top: renderer.scrollTop,
|
|
|
+ height: config.maxHeight,
|
|
|
+ width: config.width,
|
|
|
+ clientHeight: config.height,
|
|
|
+ clientWidth: config.width
|
|
|
+ };
|
|
|
+ };
|
|
|
+ this.getValue = function() {
|
|
|
+ return this.ace.getValue();
|
|
|
+ };
|
|
|
+ this.setValue = function(v) {
|
|
|
+ return this.ace.setValue(v);
|
|
|
+ };
|
|
|
+ this.getTokenTypeAt = function(pos) {
|
|
|
+ var token = this.ace.session.getTokenAt(pos.line, pos.ch);
|
|
|
+ return token && /comment|string/.test(token.type) ? "string" : "";
|
|
|
+ };
|
|
|
+ this.findMatchingBracket = function(pos) {
|
|
|
+ var m = this.ace.session.findMatchingBracket(toAcePos(pos));
|
|
|
+ return {to: m && toCmPos(m)};
|
|
|
+ };
|
|
|
+ this.indentLine = function(line, method) {
|
|
|
+ if (method === true)
|
|
|
+ this.ace.session.indentRows(line, line, "\t");
|
|
|
+ else if (method === false)
|
|
|
+ this.ace.session.outdentRows(new Range(line, 0, line, 0));
|
|
|
+ };
|
|
|
+ this.indexFromPos = function(pos) {
|
|
|
+ return this.ace.session.doc.positionToIndex(toAcePos(pos));
|
|
|
+ };
|
|
|
+ this.posFromIndex = function(index) {
|
|
|
+ return toCmPos(this.ace.session.doc.indexToPosition(index));
|
|
|
+ };
|
|
|
+ this.focus = function(index) {
|
|
|
+ return this.ace.focus();
|
|
|
+ };
|
|
|
+ this.blur = function(index) {
|
|
|
+ return this.ace.blur();
|
|
|
+ };
|
|
|
+ this.defaultTextHeight = function(index) {
|
|
|
+ return this.ace.renderer.layerConfig.lineHeight;
|
|
|
+ };
|
|
|
+ this.scanForBracket = function(pos, dir, _, options) {
|
|
|
+ var re = options.bracketRegex.source;
|
|
|
+ if (dir == 1) {
|
|
|
+ var m = this.ace.session.$findClosingBracket(re.slice(1, 2), toAcePos(pos), /paren|text/);
|
|
|
+ } else {
|
|
|
+ var m = this.ace.session.$findOpeningBracket(re.slice(-2, -1), {row: pos.line, column: pos.ch + 1}, /paren|text/);
|
|
|
+ }
|
|
|
+ return m && {pos: toCmPos(m)};
|
|
|
+ };
|
|
|
+ this.refresh = function() {
|
|
|
+ return this.ace.resize(true);
|
|
|
+ };
|
|
|
+}).call(CodeMirror.prototype);
|
|
|
+ function toAcePos(cmPos) {
|
|
|
+ return {row: cmPos.line, column: cmPos.ch};
|
|
|
+ }
|
|
|
+ function toCmPos(acePos) {
|
|
|
+ return new Pos(acePos.row, acePos.column);
|
|
|
+ }
|
|
|
|
|
|
-var dom = require("../../../lib/dom");
|
|
|
-dom.importCssString('.insert-mode .ace_cursor{\
|
|
|
- border-left: 2px solid #333333;\
|
|
|
-}\
|
|
|
-.ace_dark.insert-mode .ace_cursor{\
|
|
|
- border-left: 2px solid #eeeeee;\
|
|
|
-}\
|
|
|
-.normal-mode .ace_cursor{\
|
|
|
- border: 0!important;\
|
|
|
- background-color: red;\
|
|
|
- opacity: 0.5;\
|
|
|
-}', 'vimMode');
|
|
|
-
|
|
|
-module.exports = {
|
|
|
- onVisualMode: false,
|
|
|
- onVisualLineMode: false,
|
|
|
- currentMode: 'normal',
|
|
|
- noMode: function(editor) {
|
|
|
- editor.unsetStyle('insert-mode');
|
|
|
- editor.unsetStyle('normal-mode');
|
|
|
- if (editor.commands.recording)
|
|
|
- editor.commands.toggleRecording(editor);
|
|
|
- editor.setOverwrite(false);
|
|
|
+ var StringStream = CodeMirror.StringStream = function(string, tabSize) {
|
|
|
+ this.pos = this.start = 0;
|
|
|
+ this.string = string;
|
|
|
+ this.tabSize = tabSize || 8;
|
|
|
+ this.lastColumnPos = this.lastColumnValue = 0;
|
|
|
+ this.lineStart = 0;
|
|
|
+ };
|
|
|
+
|
|
|
+ StringStream.prototype = {
|
|
|
+ eol: function() {return this.pos >= this.string.length;},
|
|
|
+ sol: function() {return this.pos == this.lineStart;},
|
|
|
+ peek: function() {return this.string.charAt(this.pos) || undefined;},
|
|
|
+ next: function() {
|
|
|
+ if (this.pos < this.string.length)
|
|
|
+ return this.string.charAt(this.pos++);
|
|
|
},
|
|
|
- insertMode: function(editor) {
|
|
|
- this.currentMode = 'insert';
|
|
|
- editor.setStyle('insert-mode');
|
|
|
- editor.unsetStyle('normal-mode');
|
|
|
-
|
|
|
- editor.setOverwrite(false);
|
|
|
- editor.keyBinding.$data.buffer = "";
|
|
|
- editor.keyBinding.$data.vimState = "insertMode";
|
|
|
- this.onVisualMode = false;
|
|
|
- this.onVisualLineMode = false;
|
|
|
- if(this.onInsertReplaySequence) {
|
|
|
- editor.commands.macro = this.onInsertReplaySequence;
|
|
|
- editor.commands.replay(editor);
|
|
|
- this.onInsertReplaySequence = null;
|
|
|
- this.normalMode(editor);
|
|
|
- } else {
|
|
|
- editor._emit("changeStatus");
|
|
|
- if(!editor.commands.recording)
|
|
|
- editor.commands.toggleRecording(editor);
|
|
|
+ eat: function(match) {
|
|
|
+ var ch = this.string.charAt(this.pos);
|
|
|
+ if (typeof match == "string") var ok = ch == match;
|
|
|
+ else var ok = ch && (match.test ? match.test(ch) : match(ch));
|
|
|
+ if (ok) {++this.pos; return ch;}
|
|
|
+ },
|
|
|
+ eatWhile: function(match) {
|
|
|
+ var start = this.pos;
|
|
|
+ while (this.eat(match)){}
|
|
|
+ return this.pos > start;
|
|
|
+ },
|
|
|
+ eatSpace: function() {
|
|
|
+ var start = this.pos;
|
|
|
+ while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
|
|
|
+ return this.pos > start;
|
|
|
+ },
|
|
|
+ skipToEnd: function() {this.pos = this.string.length;},
|
|
|
+ skipTo: function(ch) {
|
|
|
+ var found = this.string.indexOf(ch, this.pos);
|
|
|
+ if (found > -1) {this.pos = found; return true;}
|
|
|
+ },
|
|
|
+ backUp: function(n) {this.pos -= n;},
|
|
|
+ column: function() {
|
|
|
+ throw "not implemented";
|
|
|
+ },
|
|
|
+ indentation: function() {
|
|
|
+ throw "not implemented";
|
|
|
+ },
|
|
|
+ match: function(pattern, consume, caseInsensitive) {
|
|
|
+ if (typeof pattern == "string") {
|
|
|
+ var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
|
|
|
+ var substr = this.string.substr(this.pos, pattern.length);
|
|
|
+ if (cased(substr) == cased(pattern)) {
|
|
|
+ if (consume !== false) this.pos += pattern.length;
|
|
|
+ return true;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ var match = this.string.slice(this.pos).match(pattern);
|
|
|
+ if (match && match.index > 0) return null;
|
|
|
+ if (match && consume !== false) this.pos += match[0].length;
|
|
|
+ return match;
|
|
|
+ }
|
|
|
},
|
|
|
- normalMode: function(editor) {
|
|
|
- this.currentMode = 'normal';
|
|
|
+ current: function(){return this.string.slice(this.start, this.pos);},
|
|
|
+ hideFirstChars: function(n, inner) {
|
|
|
+ this.lineStart += n;
|
|
|
+ try { return inner(); }
|
|
|
+ finally { this.lineStart -= n; }
|
|
|
+ }
|
|
|
+ };
|
|
|
+CodeMirror.defineExtension = function(name, fn) {
|
|
|
+ CodeMirror.prototype[name] = fn;
|
|
|
+};
|
|
|
+dom.importCssString(".normal-mode .ace_cursor{\
|
|
|
+ border: 0!important;\
|
|
|
+ background-color: red;\
|
|
|
+ opacity: 0.5;\
|
|
|
+}.ace_dialog {\
|
|
|
+ position: absolute;\
|
|
|
+ left: 0; right: 0;\
|
|
|
+ background: white;\
|
|
|
+ z-index: 15;\
|
|
|
+ padding: .1em .8em;\
|
|
|
+ overflow: hidden;\
|
|
|
+ color: #333;\
|
|
|
+}\
|
|
|
+.ace_dialog-top {\
|
|
|
+ border-bottom: 1px solid #eee;\
|
|
|
+ top: 0;\
|
|
|
+}\
|
|
|
+.ace_dialog-bottom {\
|
|
|
+ border-top: 1px solid #eee;\
|
|
|
+ bottom: 0;\
|
|
|
+}\
|
|
|
+.ace_dialog input {\
|
|
|
+ border: none;\
|
|
|
+ outline: none;\
|
|
|
+ background: transparent;\
|
|
|
+ width: 20em;\
|
|
|
+ color: inherit;\
|
|
|
+ font-family: monospace;\
|
|
|
+}", "vimMode");
|
|
|
+(function() {
|
|
|
+ function dialogDiv(cm, template, bottom) {
|
|
|
+ var wrap = cm.ace.container;
|
|
|
+ var dialog;
|
|
|
+ dialog = wrap.appendChild(document.createElement("div"));
|
|
|
+ if (bottom)
|
|
|
+ dialog.className = "ace_dialog ace_dialog-bottom";
|
|
|
+ else
|
|
|
+ dialog.className = "ace_dialog ace_dialog-top";
|
|
|
|
|
|
- editor.unsetStyle('insert-mode');
|
|
|
- editor.setStyle('normal-mode');
|
|
|
- editor.clearSelection();
|
|
|
+ if (typeof template == "string") {
|
|
|
+ dialog.innerHTML = template;
|
|
|
+ } else { // Assuming it's a detached DOM element.
|
|
|
+ dialog.appendChild(template);
|
|
|
+ }
|
|
|
+ return dialog;
|
|
|
+ }
|
|
|
|
|
|
- var pos;
|
|
|
- if (!editor.getOverwrite()) {
|
|
|
- pos = editor.getCursorPosition();
|
|
|
- if (pos.column > 0)
|
|
|
- editor.navigateLeft();
|
|
|
- }
|
|
|
+ function closeNotification(cm, newVal) {
|
|
|
+ if (cm.state.currentNotificationClose)
|
|
|
+ cm.state.currentNotificationClose();
|
|
|
+ cm.state.currentNotificationClose = newVal;
|
|
|
+ }
|
|
|
|
|
|
- editor.setOverwrite(true);
|
|
|
- editor.keyBinding.$data.buffer = "";
|
|
|
- editor.keyBinding.$data.vimState = "start";
|
|
|
- this.onVisualMode = false;
|
|
|
- this.onVisualLineMode = false;
|
|
|
- editor._emit("changeStatus");
|
|
|
- if (editor.commands.recording) {
|
|
|
- editor.commands.toggleRecording(editor);
|
|
|
- return editor.commands.macro;
|
|
|
- }
|
|
|
- else {
|
|
|
- return [];
|
|
|
- }
|
|
|
- },
|
|
|
- visualMode: function(editor, lineMode) {
|
|
|
- if (
|
|
|
- (this.onVisualLineMode && lineMode)
|
|
|
- || (this.onVisualMode && !lineMode)
|
|
|
- ) {
|
|
|
- this.normalMode(editor);
|
|
|
- return;
|
|
|
- }
|
|
|
+ CodeMirror.defineExtension("openDialog", function(template, callback, options) {
|
|
|
+ if (this.virtualSelectionMode()) return;
|
|
|
+ if (!options) options = {};
|
|
|
|
|
|
- editor.setStyle('insert-mode');
|
|
|
- editor.unsetStyle('normal-mode');
|
|
|
+ closeNotification(this, null);
|
|
|
|
|
|
- editor._emit("changeStatus");
|
|
|
- if (lineMode) {
|
|
|
- this.onVisualLineMode = true;
|
|
|
- } else {
|
|
|
- this.onVisualMode = true;
|
|
|
- this.onVisualLineMode = false;
|
|
|
+ var dialog = dialogDiv(this, template, options.bottom);
|
|
|
+ var closed = false, me = this;
|
|
|
+ function close(newVal) {
|
|
|
+ if (typeof newVal == 'string') {
|
|
|
+ inp.value = newVal;
|
|
|
+ } else {
|
|
|
+ if (closed) return;
|
|
|
+ closed = true;
|
|
|
+ dialog.parentNode.removeChild(dialog);
|
|
|
+ me.focus();
|
|
|
+
|
|
|
+ if (options.onClose) options.onClose(dialog);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ var inp = dialog.getElementsByTagName("input")[0], button;
|
|
|
+ if (inp) {
|
|
|
+ if (options.value) {
|
|
|
+ inp.value = options.value;
|
|
|
+ inp.select();
|
|
|
+ }
|
|
|
+
|
|
|
+ if (options.onInput)
|
|
|
+ CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
|
|
|
+ if (options.onKeyUp)
|
|
|
+ CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
|
|
|
+
|
|
|
+ CodeMirror.on(inp, "keydown", function(e) {
|
|
|
+ if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
|
|
|
+ if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
|
|
|
+ inp.blur();
|
|
|
+ CodeMirror.e_stop(e);
|
|
|
+ close();
|
|
|
}
|
|
|
- },
|
|
|
- getRightNthChar: function(editor, cursor, ch, n) {
|
|
|
- var line = editor.getSession().getLine(cursor.row);
|
|
|
- var matches = line.substr(cursor.column + 1).split(ch);
|
|
|
+ if (e.keyCode == 13) callback(inp.value);
|
|
|
+ });
|
|
|
|
|
|
- return n < matches.length ? matches.slice(0, n).join(ch).length : null;
|
|
|
- },
|
|
|
- getLeftNthChar: function(editor, cursor, ch, n) {
|
|
|
- var line = editor.getSession().getLine(cursor.row);
|
|
|
- var matches = line.substr(0, cursor.column).split(ch);
|
|
|
+ if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
|
|
|
|
|
|
- return n < matches.length ? matches.slice(-1 * n).join(ch).length : null;
|
|
|
- },
|
|
|
- toRealChar: function(ch) {
|
|
|
- if (ch.length === 1)
|
|
|
- return ch;
|
|
|
-
|
|
|
- if (/^shift-./.test(ch))
|
|
|
- return ch[ch.length - 1].toUpperCase();
|
|
|
- else
|
|
|
- return "";
|
|
|
- },
|
|
|
- copyLine: function(editor) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- editor.selection.moveTo(pos.row, pos.column);
|
|
|
- editor.selection.selectLine();
|
|
|
- registers._default.isLine = true;
|
|
|
- registers._default.text = editor.getCopyText().replace(/\n$/, "");
|
|
|
- editor.selection.moveTo(pos.row, pos.column);
|
|
|
+ inp.focus();
|
|
|
+ } else if (button = dialog.getElementsByTagName("button")[0]) {
|
|
|
+ CodeMirror.on(button, "click", function() {
|
|
|
+ close();
|
|
|
+ me.focus();
|
|
|
+ });
|
|
|
+
|
|
|
+ if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
|
|
|
+
|
|
|
+ button.focus();
|
|
|
}
|
|
|
-};
|
|
|
-});
|
|
|
+ return close;
|
|
|
+ });
|
|
|
+
|
|
|
+ CodeMirror.defineExtension("openNotification", function(template, options) {
|
|
|
+ if (this.virtualSelectionMode()) return;
|
|
|
+ closeNotification(this, close);
|
|
|
+ var dialog = dialogDiv(this, template, options && options.bottom);
|
|
|
+ var closed = false, doneTimer;
|
|
|
+ var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
|
|
|
|
|
|
-ace.define("ace/keyboard/vim/maps/motions",["require","exports","module","ace/keyboard/vim/maps/util","ace/search","ace/range"], function(require, exports, module) {
|
|
|
-"use strict";
|
|
|
+ function close() {
|
|
|
+ if (closed) return;
|
|
|
+ closed = true;
|
|
|
+ clearTimeout(doneTimer);
|
|
|
+ dialog.parentNode.removeChild(dialog);
|
|
|
+ }
|
|
|
|
|
|
-var util = require("./util");
|
|
|
+ CodeMirror.on(dialog, 'click', function(e) {
|
|
|
+ CodeMirror.e_preventDefault(e);
|
|
|
+ close();
|
|
|
+ });
|
|
|
|
|
|
-var keepScrollPosition = function(editor, fn) {
|
|
|
- var scrollTopRow = editor.renderer.getScrollTopRow();
|
|
|
- var initialRow = editor.getCursorPosition().row;
|
|
|
- var diff = initialRow - scrollTopRow;
|
|
|
- fn && fn.call(editor);
|
|
|
- editor.renderer.scrollToRow(editor.getCursorPosition().row - diff);
|
|
|
-};
|
|
|
+ if (duration)
|
|
|
+ doneTimer = setTimeout(close, duration);
|
|
|
|
|
|
-function Motion(m) {
|
|
|
- if (typeof m == "function") {
|
|
|
- var getPos = m;
|
|
|
- m = this;
|
|
|
- } else {
|
|
|
- var getPos = m.getPos;
|
|
|
+ return close;
|
|
|
+ });
|
|
|
+})();
|
|
|
+
|
|
|
+
|
|
|
+ var defaultKeymap = [
|
|
|
+ { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
|
|
|
+ { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
|
|
|
+ { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
|
|
|
+ { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
|
|
|
+ { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
|
|
|
+ { keys: '<BS>', type: 'keyToKey', toKeys: 'h' },
|
|
|
+ { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
|
|
|
+ { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B' },
|
|
|
+ { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
|
|
|
+ { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b' },
|
|
|
+ { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
|
|
|
+ { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
|
|
|
+ { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
|
|
|
+ { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
|
|
|
+ { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
|
|
|
+ { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
|
|
|
+ { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
|
|
|
+ { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'},
|
|
|
+ { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
|
|
|
+ { keys: 'S', type: 'keyToKey', toKeys: 'dcc', context: 'visual' },
|
|
|
+ { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
|
|
|
+ { keys: '<End>', type: 'keyToKey', toKeys: '$' },
|
|
|
+ { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
|
|
|
+ { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
|
|
|
+ { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
|
|
|
+ { 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 }},
|
|
|
+ { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
|
|
|
+ { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
|
|
|
+ { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
|
|
|
+ { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
|
|
|
+ { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
|
|
|
+ { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
|
|
|
+ { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
|
|
|
+ { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
|
|
|
+ { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
|
|
|
+ { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
|
|
|
+ { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
|
|
|
+ { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
|
|
|
+ { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
|
|
|
+ { 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: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
|
|
|
+ { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
|
|
|
+ { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
|
|
|
+ { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
|
|
|
+ { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
|
|
|
+ { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
|
|
|
+ { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
|
|
|
+ { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
|
|
|
+ { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
|
|
|
+ { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
|
|
|
+ { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
|
|
|
+ { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
|
|
|
+ { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
|
|
|
+ { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
|
|
|
+ { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
|
|
|
+ { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
|
|
|
+ { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
|
|
|
+ { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
|
|
|
+ { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
|
|
|
+ { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
|
|
|
+ { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
|
|
|
+ { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
|
|
|
+ { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
|
|
|
+ { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
|
|
|
+ { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
|
|
|
+ { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
|
|
|
+ { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
|
|
|
+ { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
|
|
|
+ { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
|
|
|
+ { keys: '|', type: 'motion', motion: 'moveToColumn'},
|
|
|
+ { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
|
|
|
+ { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
|
|
|
+ { keys: 'd', type: 'operator', operator: 'delete' },
|
|
|
+ { keys: 'y', type: 'operator', operator: 'yank' },
|
|
|
+ { keys: 'c', type: 'operator', operator: 'change' },
|
|
|
+ { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
|
|
|
+ { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
|
|
|
+ { keys: 'g~', type: 'operator', operator: 'changeCase' },
|
|
|
+ { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
|
|
|
+ { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
|
|
|
+ { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
|
|
|
+ { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
|
|
|
+ { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
|
|
|
+ { 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: '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: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
|
|
|
+ { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
|
|
|
+ { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
|
|
|
+ { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
|
|
|
+ { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
|
|
|
+ { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
|
|
|
+ { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
|
|
|
+ { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
|
|
|
+ { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
|
|
|
+ { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
|
|
|
+ { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
|
|
|
+ { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
|
|
|
+ { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
|
|
|
+ { keys: 'v', type: 'action', action: 'toggleVisualMode' },
|
|
|
+ { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
|
|
|
+ { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
|
|
|
+ { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
|
|
|
+ { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
|
|
|
+ { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
|
|
|
+ { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
|
|
|
+ { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
|
|
|
+ { keys: '@<character>', type: 'action', action: 'replayMacro' },
|
|
|
+ { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
|
|
|
+ { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: 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 },
|
|
|
+ { keys: '<C-r>', type: 'action', action: 'redo' },
|
|
|
+ { keys: 'm<character>', type: 'action', action: 'setMark' },
|
|
|
+ { keys: '"<character>', type: 'action', action: 'setRegister' },
|
|
|
+ { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
|
|
|
+ { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
|
|
|
+ { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
|
|
|
+ { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
|
|
|
+ { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
|
|
|
+ { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
|
|
|
+ { keys: '.', type: 'action', action: 'repeatLastEdit' },
|
|
|
+ { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
|
|
|
+ { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
|
|
|
+ { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
|
|
|
+ { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
|
|
|
+ { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
|
|
|
+ { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
|
|
|
+ { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
|
|
|
+ { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
|
|
|
+ { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
|
|
|
+ { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
|
|
|
+ { keys: ':', type: 'ex' }
|
|
|
+ ];
|
|
|
+
|
|
|
+ var Pos = CodeMirror.Pos;
|
|
|
+
|
|
|
+ var modifierCodes = [16, 17, 18, 91];
|
|
|
+ var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
|
|
|
+ var mac = /Mac/.test(navigator.platform);
|
|
|
+ var Vim = function() { return vimApi; } //{
|
|
|
+ function lookupKey(e) {
|
|
|
+ var keyCode = e.keyCode;
|
|
|
+ if (modifierCodes.indexOf(keyCode) != -1) { return; }
|
|
|
+ var hasModifier = e.ctrlKey || e.metaKey;
|
|
|
+ var key = CodeMirror.keyNames[keyCode];
|
|
|
+ key = specialKey[key] || key;
|
|
|
+ var name = '';
|
|
|
+ if (e.ctrlKey) { name += 'C-'; }
|
|
|
+ if (e.altKey) { name += 'A-'; }
|
|
|
+ if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
|
|
|
+ return;
|
|
|
+ } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
|
|
|
+ name += 'S-';
|
|
|
+ }
|
|
|
+ if (key.length == 1) { key = key.toLowerCase(); }
|
|
|
+ name += key;
|
|
|
+ if (name.length > 1) { name = '<' + name + '>'; }
|
|
|
+ return name;
|
|
|
}
|
|
|
- m.nav = function(editor, range, count, param) {
|
|
|
- var a = getPos(editor, range, count, param, false);
|
|
|
- if (!a)
|
|
|
- return;
|
|
|
- editor.selection.moveTo(a.row, a.column);
|
|
|
- };
|
|
|
- m.sel = function(editor, range, count, param) {
|
|
|
- var a = getPos(editor, range, count, param, true);
|
|
|
- if (!a)
|
|
|
- return;
|
|
|
- editor.selection.selectTo(a.row, a.column);
|
|
|
- };
|
|
|
- return m;
|
|
|
-}
|
|
|
-
|
|
|
-var nonWordRe = /[\s.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/;
|
|
|
-var wordSeparatorRe = /[.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/;
|
|
|
-var whiteRe = /\s/;
|
|
|
-var StringStream = function(editor, cursor) {
|
|
|
- var sel = editor.selection;
|
|
|
- this.range = sel.getRange();
|
|
|
- cursor = cursor || sel.selectionLead;
|
|
|
- this.row = cursor.row;
|
|
|
- this.col = cursor.column;
|
|
|
- var line = editor.session.getLine(this.row);
|
|
|
- var maxRow = editor.session.getLength();
|
|
|
- this.ch = line[this.col] || '\n';
|
|
|
- this.skippedLines = 0;
|
|
|
-
|
|
|
- this.next = function() {
|
|
|
- this.ch = line[++this.col] || this.handleNewLine(1);
|
|
|
- return this.ch;
|
|
|
- };
|
|
|
- this.prev = function() {
|
|
|
- this.ch = line[--this.col] || this.handleNewLine(-1);
|
|
|
- return this.ch;
|
|
|
+ function handleKeyDown(cm, e) {
|
|
|
+ var name = lookupKey(e);
|
|
|
+ if (!name) { return; }
|
|
|
+
|
|
|
+ CodeMirror.signal(cm, 'vim-keypress', name);
|
|
|
+ if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
|
|
|
+ CodeMirror.e_stop(e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function handleKeyPress(cm, e) {
|
|
|
+ var code = e.charCode || e.keyCode;
|
|
|
+ if (e.ctrlKey || e.metaKey || e.altKey ||
|
|
|
+ e.shiftKey && code < 32) { return; }
|
|
|
+ var name = String.fromCharCode(code);
|
|
|
+
|
|
|
+ CodeMirror.signal(cm, 'vim-keypress', name);
|
|
|
+ if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
|
|
|
+ CodeMirror.e_stop(e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ function enterVimMode(cm) {
|
|
|
+ cm.setOption('disableInput', true);
|
|
|
+ cm.setOption('showCursorWhenSelecting', false);
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
|
|
|
+ cm.on('cursorActivity', onCursorActivity);
|
|
|
+ maybeInitVimState(cm);
|
|
|
+ CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
|
|
|
+ cm.on('keypress', handleKeyPress);
|
|
|
+ cm.on('keydown', handleKeyDown);
|
|
|
+ }
|
|
|
+
|
|
|
+ function leaveVimMode(cm) {
|
|
|
+ cm.setOption('disableInput', false);
|
|
|
+ cm.off('cursorActivity', onCursorActivity);
|
|
|
+ CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
|
|
|
+ cm.state.vim = null;
|
|
|
+ cm.off('keypress', handleKeyPress);
|
|
|
+ cm.off('keydown', handleKeyDown);
|
|
|
+ }
|
|
|
+
|
|
|
+ function detachVimMap(cm, next) {
|
|
|
+ if (this == CodeMirror.keyMap.vim)
|
|
|
+ CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
|
|
|
+
|
|
|
+ if (!next || next.attach != attachVimMap)
|
|
|
+ leaveVimMode(cm, false);
|
|
|
+ }
|
|
|
+ function attachVimMap(cm, prev) {
|
|
|
+ if (this == CodeMirror.keyMap.vim)
|
|
|
+ CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
|
|
|
+
|
|
|
+ if (!prev || prev.attach != attachVimMap)
|
|
|
+ enterVimMode(cm);
|
|
|
+ }
|
|
|
+ CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
|
|
|
+ if (val && cm.getOption("keyMap") != "vim")
|
|
|
+ cm.setOption("keyMap", "vim");
|
|
|
+ else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
|
|
|
+ cm.setOption("keyMap", "default");
|
|
|
+ });
|
|
|
+ function getOnPasteFn(cm) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ if (!vim.onPasteFn) {
|
|
|
+ vim.onPasteFn = function() {
|
|
|
+ if (!vim.insertMode) {
|
|
|
+ cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
|
|
|
+ actions.enterInsertMode(cm, {}, vim);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ }
|
|
|
+ return vim.onPasteFn;
|
|
|
+ }
|
|
|
+
|
|
|
+ var numberRegex = /[\d]/;
|
|
|
+ var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];
|
|
|
+ function makeKeyRange(start, size) {
|
|
|
+ var keys = [];
|
|
|
+ for (var i = start; i < start + size; i++) {
|
|
|
+ keys.push(String.fromCharCode(i));
|
|
|
+ }
|
|
|
+ return keys;
|
|
|
+ }
|
|
|
+ var upperCaseAlphabet = makeKeyRange(65, 26);
|
|
|
+ var lowerCaseAlphabet = makeKeyRange(97, 26);
|
|
|
+ var numbers = makeKeyRange(48, 10);
|
|
|
+ var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
|
|
|
+ var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
|
|
|
+
|
|
|
+ function isLine(cm, line) {
|
|
|
+ return line >= cm.firstLine() && line <= cm.lastLine();
|
|
|
+ }
|
|
|
+ function isLowerCase(k) {
|
|
|
+ return (/^[a-z]$/).test(k);
|
|
|
+ }
|
|
|
+ function isMatchableSymbol(k) {
|
|
|
+ return '()[]{}'.indexOf(k) != -1;
|
|
|
+ }
|
|
|
+ function isNumber(k) {
|
|
|
+ return numberRegex.test(k);
|
|
|
+ }
|
|
|
+ function isUpperCase(k) {
|
|
|
+ return (/^[A-Z]$/).test(k);
|
|
|
+ }
|
|
|
+ function isWhiteSpaceString(k) {
|
|
|
+ return (/^\s*$/).test(k);
|
|
|
+ }
|
|
|
+ function inArray(val, arr) {
|
|
|
+ for (var i = 0; i < arr.length; i++) {
|
|
|
+ if (arr[i] == val) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ var options = {};
|
|
|
+ function defineOption(name, defaultValue, type) {
|
|
|
+ if (defaultValue === undefined) { throw Error('defaultValue is required'); }
|
|
|
+ if (!type) { type = 'string'; }
|
|
|
+ var opt = name;
|
|
|
+ if (typeof name == "string")
|
|
|
+ opt = {
|
|
|
+ type: type,
|
|
|
+ defaultValue: defaultValue
|
|
|
+ };
|
|
|
+ else
|
|
|
+ name = opt.name;
|
|
|
+ options[name] = opt;
|
|
|
+ setOption(name, defaultValue);
|
|
|
+ }
|
|
|
+
|
|
|
+ function setOption(name, value, cm) {
|
|
|
+ var option = options[name];
|
|
|
+ if (!option) {
|
|
|
+ throw Error('Unknown option: ' + name);
|
|
|
+ }
|
|
|
+ if (option.type == 'boolean') {
|
|
|
+ if (value && value !== true) {
|
|
|
+ throw Error('Invalid argument: ' + name + '=' + value);
|
|
|
+ } else if (value !== false) {
|
|
|
+ value = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ option.value = value;
|
|
|
+ if (option.set) option.set(value, cm);
|
|
|
+ }
|
|
|
+
|
|
|
+ function getOption(name) {
|
|
|
+ var option = options[name];
|
|
|
+ if (!option) {
|
|
|
+ throw Error('Unknown option: ' + name);
|
|
|
+ }
|
|
|
+ return option.value;
|
|
|
+ }
|
|
|
+
|
|
|
+ var createCircularJumpList = function() {
|
|
|
+ var size = 100;
|
|
|
+ var pointer = -1;
|
|
|
+ var head = 0;
|
|
|
+ var tail = 0;
|
|
|
+ var buffer = new Array(size);
|
|
|
+ function add(cm, oldCur, newCur) {
|
|
|
+ var current = pointer % size;
|
|
|
+ var curMark = buffer[current];
|
|
|
+ function useNextSlot(cursor) {
|
|
|
+ var next = ++pointer % size;
|
|
|
+ var trashMark = buffer[next];
|
|
|
+ if (trashMark) {
|
|
|
+ trashMark.clear();
|
|
|
+ }
|
|
|
+ buffer[next] = cm.setBookmark(cursor);
|
|
|
+ }
|
|
|
+ if (curMark) {
|
|
|
+ var markPos = curMark.find();
|
|
|
+ if (markPos && !cursorEqual(markPos, oldCur)) {
|
|
|
+ useNextSlot(oldCur);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ useNextSlot(oldCur);
|
|
|
+ }
|
|
|
+ useNextSlot(newCur);
|
|
|
+ head = pointer;
|
|
|
+ tail = pointer - size + 1;
|
|
|
+ if (tail < 0) {
|
|
|
+ tail = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function move(cm, offset) {
|
|
|
+ pointer += offset;
|
|
|
+ if (pointer > head) {
|
|
|
+ pointer = head;
|
|
|
+ } else if (pointer < tail) {
|
|
|
+ pointer = tail;
|
|
|
+ }
|
|
|
+ var mark = buffer[(size + pointer) % size];
|
|
|
+ if (mark && !mark.find()) {
|
|
|
+ var inc = offset > 0 ? 1 : -1;
|
|
|
+ var newCur;
|
|
|
+ var oldCur = cm.getCursor();
|
|
|
+ do {
|
|
|
+ pointer += inc;
|
|
|
+ mark = buffer[(size + pointer) % size];
|
|
|
+ if (mark &&
|
|
|
+ (newCur = mark.find()) &&
|
|
|
+ !cursorEqual(oldCur, newCur)) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ } while (pointer < head && pointer > tail);
|
|
|
+ }
|
|
|
+ return mark;
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ cachedCursor: undefined, //used for # and * jumps
|
|
|
+ add: add,
|
|
|
+ move: move
|
|
|
+ };
|
|
|
};
|
|
|
- this.peek = function(dir) {
|
|
|
- var ch = line[this.col + dir];
|
|
|
- if (ch)
|
|
|
- return ch;
|
|
|
- if (dir == -1)
|
|
|
- return '\n';
|
|
|
- if (this.col == line.length - 1)
|
|
|
- return '\n';
|
|
|
- return editor.session.getLine(this.row + 1)[0] || '\n';
|
|
|
+ var createInsertModeChanges = function(c) {
|
|
|
+ if (c) {
|
|
|
+ return {
|
|
|
+ changes: c.changes,
|
|
|
+ expectCursorActivityForChange: c.expectCursorActivityForChange
|
|
|
+ };
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ changes: [],
|
|
|
+ expectCursorActivityForChange: false
|
|
|
+ };
|
|
|
};
|
|
|
|
|
|
- this.handleNewLine = function(dir) {
|
|
|
- if (dir == 1){
|
|
|
- if (this.col == line.length)
|
|
|
- return '\n';
|
|
|
- if (this.row == maxRow - 1)
|
|
|
- return '';
|
|
|
- this.col = 0;
|
|
|
- this.row ++;
|
|
|
- line = editor.session.getLine(this.row);
|
|
|
- this.skippedLines++;
|
|
|
- return line[0] || '\n';
|
|
|
- }
|
|
|
- if (dir == -1) {
|
|
|
- if (this.row === 0)
|
|
|
- return '';
|
|
|
- this.row --;
|
|
|
- line = editor.session.getLine(this.row);
|
|
|
- this.col = line.length;
|
|
|
- this.skippedLines--;
|
|
|
- return '\n';
|
|
|
+ function MacroModeState() {
|
|
|
+ this.latestRegister = undefined;
|
|
|
+ this.isPlaying = false;
|
|
|
+ this.isRecording = false;
|
|
|
+ this.replaySearchQueries = [];
|
|
|
+ this.onRecordingDone = undefined;
|
|
|
+ this.lastInsertModeChanges = createInsertModeChanges();
|
|
|
+ }
|
|
|
+ MacroModeState.prototype = {
|
|
|
+ exitMacroRecordMode: function() {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (macroModeState.onRecordingDone) {
|
|
|
+ macroModeState.onRecordingDone(); // close dialog
|
|
|
}
|
|
|
+ macroModeState.onRecordingDone = undefined;
|
|
|
+ macroModeState.isRecording = false;
|
|
|
+ },
|
|
|
+ enterMacroRecordMode: function(cm, registerName) {
|
|
|
+ var register =
|
|
|
+ vimGlobalState.registerController.getRegister(registerName);
|
|
|
+ if (register) {
|
|
|
+ register.clear();
|
|
|
+ this.latestRegister = registerName;
|
|
|
+ if (cm.openDialog) {
|
|
|
+ this.onRecordingDone = cm.openDialog(
|
|
|
+ '(recording)['+registerName+']', null, {bottom:true});
|
|
|
+ }
|
|
|
+ this.isRecording = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
- this.debug = function() {
|
|
|
- console.log(line.substring(0, this.col)+'|'+this.ch+'\''+this.col+'\''+line.substr(this.col+1));
|
|
|
- };
|
|
|
-};
|
|
|
|
|
|
-var Search = require("../../../search").Search;
|
|
|
-var search = new Search();
|
|
|
+ function maybeInitVimState(cm) {
|
|
|
+ if (!cm.state.vim) {
|
|
|
+ cm.state.vim = {
|
|
|
+ inputState: new InputState(),
|
|
|
+ lastEditInputState: undefined,
|
|
|
+ lastEditActionCommand: undefined,
|
|
|
+ lastHPos: -1,
|
|
|
+ lastHSPos: -1,
|
|
|
+ lastMotion: null,
|
|
|
+ marks: {},
|
|
|
+ fakeCursor: null,
|
|
|
+ insertMode: false,
|
|
|
+ insertModeRepeat: undefined,
|
|
|
+ visualMode: false,
|
|
|
+ visualLine: false,
|
|
|
+ visualBlock: false,
|
|
|
+ lastSelection: null,
|
|
|
+ lastPastedText: null,
|
|
|
+ sel: {
|
|
|
+ }
|
|
|
+ };
|
|
|
+ }
|
|
|
+ return cm.state.vim;
|
|
|
+ }
|
|
|
+ var vimGlobalState;
|
|
|
+ function resetVimGlobalState() {
|
|
|
+ vimGlobalState = {
|
|
|
+ searchQuery: null,
|
|
|
+ searchIsReversed: false,
|
|
|
+ lastSubstituteReplacePart: undefined,
|
|
|
+ jumpList: createCircularJumpList(),
|
|
|
+ macroModeState: new MacroModeState,
|
|
|
+ lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
|
|
|
+ registerController: new RegisterController({}),
|
|
|
+ searchHistoryController: new HistoryController({}),
|
|
|
+ exCommandHistoryController : new HistoryController({})
|
|
|
+ };
|
|
|
+ for (var optionName in options) {
|
|
|
+ var option = options[optionName];
|
|
|
+ option.value = option.defaultValue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ var lastInsertModeKeyTimer;
|
|
|
+ var vimApi= {
|
|
|
+ buildKeyMap: function() {
|
|
|
+ },
|
|
|
+ getRegisterController: function() {
|
|
|
+ return vimGlobalState.registerController;
|
|
|
+ },
|
|
|
+ resetVimGlobalState_: resetVimGlobalState,
|
|
|
+ getVimGlobalState_: function() {
|
|
|
+ return vimGlobalState;
|
|
|
+ },
|
|
|
+ maybeInitVimState_: maybeInitVimState,
|
|
|
|
|
|
-function find(editor, needle, dir) {
|
|
|
- search.$options.needle = needle;
|
|
|
- search.$options.backwards = dir == -1;
|
|
|
- return search.find(editor.session);
|
|
|
-}
|
|
|
+ InsertModeKey: InsertModeKey,
|
|
|
+ map: function(lhs, rhs, ctx) {
|
|
|
+ exCommandDispatcher.map(lhs, rhs, ctx);
|
|
|
+ },
|
|
|
+ unmap: function(lhs, ctx) {
|
|
|
+ exCommandDispatcher.unmap(lhs, ctx);
|
|
|
+ },
|
|
|
+ setOption: setOption,
|
|
|
+ getOption: getOption,
|
|
|
+ defineOption: defineOption,
|
|
|
+ defineEx: function(name, prefix, func){
|
|
|
+ if (name.indexOf(prefix) !== 0) {
|
|
|
+ throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
|
|
|
+ }
|
|
|
+ exCommands[name]=func;
|
|
|
+ exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
|
|
|
+ },
|
|
|
+ handleKey: function(cm, key, origin) {
|
|
|
+ var vim = maybeInitVimState(cm);
|
|
|
+ function handleMacroRecording() {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (macroModeState.isRecording) {
|
|
|
+ if (key == 'q') {
|
|
|
+ macroModeState.exitMacroRecordMode();
|
|
|
+ clearInputState(cm);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ if (origin != 'mapping') {
|
|
|
+ logKey(macroModeState, key);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function handleEsc() {
|
|
|
+ if (key == '<Esc>') {
|
|
|
+ clearInputState(cm);
|
|
|
+ if (vim.visualMode) {
|
|
|
+ exitVisualMode(cm);
|
|
|
+ } else if (vim.insertMode) {
|
|
|
+ exitInsertMode(cm);
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function doKeyToKey(keys) {
|
|
|
+ var match;
|
|
|
+ while (keys) {
|
|
|
+ match = (/<\w+-.+?>|<\w+>|./).exec(keys);
|
|
|
+ key = match[0];
|
|
|
+ keys = keys.substring(match.index + key.length);
|
|
|
+ CodeMirror.Vim.handleKey(cm, key, 'mapping');
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
-var Range = require("../../../range").Range;
|
|
|
+ function handleKeyInsertMode() {
|
|
|
+ if (handleEsc()) { return true; }
|
|
|
+ var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
|
|
|
+ var keysAreChars = key.length == 1;
|
|
|
+ var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
|
|
|
+ while (keys.length > 1 && match.type != 'full') {
|
|
|
+ var keys = vim.inputState.keyBuffer = keys.slice(1);
|
|
|
+ var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
|
|
|
+ if (thisMatch.type != 'none') { match = thisMatch; }
|
|
|
+ }
|
|
|
+ if (match.type == 'none') { clearInputState(cm); return false; }
|
|
|
+ else if (match.type == 'partial') {
|
|
|
+ if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
|
|
|
+ lastInsertModeKeyTimer = window.setTimeout(
|
|
|
+ function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
|
|
|
+ getOption('insertModeEscKeysTimeout'));
|
|
|
+ return !keysAreChars;
|
|
|
+ }
|
|
|
|
|
|
-var LAST_SEARCH_MOTION = {};
|
|
|
+ if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
|
|
|
+ if (keysAreChars) {
|
|
|
+ var here = cm.getCursor();
|
|
|
+ cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
|
|
|
+ }
|
|
|
+ clearInputState(cm);
|
|
|
+ var command = match.command;
|
|
|
+ if (command.type == 'keyToKey') {
|
|
|
+ doKeyToKey(command.toKeys);
|
|
|
+ } else {
|
|
|
+ commandDispatcher.processCommand(cm, vim, command);
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
|
|
|
-module.exports = {
|
|
|
- "w": new Motion(function(editor) {
|
|
|
- var str = new StringStream(editor);
|
|
|
+ function handleKeyNonInsertMode() {
|
|
|
+ if (handleMacroRecording() || handleEsc()) { return true; };
|
|
|
|
|
|
- if (str.ch && wordSeparatorRe.test(str.ch)) {
|
|
|
- while (str.ch && wordSeparatorRe.test(str.ch))
|
|
|
- str.next();
|
|
|
- } else {
|
|
|
- while (str.ch && !nonWordRe.test(str.ch))
|
|
|
- str.next();
|
|
|
- }
|
|
|
- while (str.ch && whiteRe.test(str.ch) && str.skippedLines < 2)
|
|
|
- str.next();
|
|
|
-
|
|
|
- str.skippedLines == 2 && str.prev();
|
|
|
- return {column: str.col, row: str.row};
|
|
|
- }),
|
|
|
- "W": new Motion(function(editor) {
|
|
|
- var str = new StringStream(editor);
|
|
|
- while(str.ch && !(whiteRe.test(str.ch) && !whiteRe.test(str.peek(1))) && str.skippedLines < 2)
|
|
|
- str.next();
|
|
|
- if (str.skippedLines == 2)
|
|
|
- str.prev();
|
|
|
- else
|
|
|
- str.next();
|
|
|
-
|
|
|
- return {column: str.col, row: str.row};
|
|
|
- }),
|
|
|
- "b": new Motion(function(editor) {
|
|
|
- var str = new StringStream(editor);
|
|
|
-
|
|
|
- str.prev();
|
|
|
- while (str.ch && whiteRe.test(str.ch) && str.skippedLines > -2)
|
|
|
- str.prev();
|
|
|
-
|
|
|
- if (str.ch && wordSeparatorRe.test(str.ch)) {
|
|
|
- while (str.ch && wordSeparatorRe.test(str.ch))
|
|
|
- str.prev();
|
|
|
- } else {
|
|
|
- while (str.ch && !nonWordRe.test(str.ch))
|
|
|
- str.prev();
|
|
|
- }
|
|
|
- str.ch && str.next();
|
|
|
- return {column: str.col, row: str.row};
|
|
|
- }),
|
|
|
- "B": new Motion(function(editor) {
|
|
|
- var str = new StringStream(editor);
|
|
|
- str.prev();
|
|
|
- while(str.ch && !(!whiteRe.test(str.ch) && whiteRe.test(str.peek(-1))) && str.skippedLines > -2)
|
|
|
- str.prev();
|
|
|
-
|
|
|
- if (str.skippedLines == -2)
|
|
|
- str.next();
|
|
|
-
|
|
|
- return {column: str.col, row: str.row};
|
|
|
- }),
|
|
|
- "e": new Motion(function(editor) {
|
|
|
- var str = new StringStream(editor);
|
|
|
-
|
|
|
- str.next();
|
|
|
- while (str.ch && whiteRe.test(str.ch))
|
|
|
- str.next();
|
|
|
-
|
|
|
- if (str.ch && wordSeparatorRe.test(str.ch)) {
|
|
|
- while (str.ch && wordSeparatorRe.test(str.ch))
|
|
|
- str.next();
|
|
|
+ var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
|
|
|
+ if (/^[1-9]\d*$/.test(keys)) { return true; }
|
|
|
+
|
|
|
+ var keysMatcher = /^(\d*)(.*)$/.exec(keys);
|
|
|
+ if (!keysMatcher) { clearInputState(cm); return false; }
|
|
|
+ var context = vim.visualMode ? 'visual' :
|
|
|
+ 'normal';
|
|
|
+ var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
|
|
|
+ if (match.type == 'none') { clearInputState(cm); return false; }
|
|
|
+ else if (match.type == 'partial') { return true; }
|
|
|
+
|
|
|
+ vim.inputState.keyBuffer = '';
|
|
|
+ var command = match.command;
|
|
|
+ var keysMatcher = /^(\d*)(.*)$/.exec(keys);
|
|
|
+ if (keysMatcher[1] && keysMatcher[1] != '0') {
|
|
|
+ vim.inputState.pushRepeatDigit(keysMatcher[1]);
|
|
|
+ }
|
|
|
+ if (command.type == 'keyToKey') {
|
|
|
+ doKeyToKey(command.toKeys);
|
|
|
+ } else {
|
|
|
+ commandDispatcher.processCommand(cm, vim, command);
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ return cm.operation(function() {
|
|
|
+ cm.curOp.isVimOp = true;
|
|
|
+ try {
|
|
|
+ if (vim.insertMode) { return handleKeyInsertMode(); }
|
|
|
+ else { return handleKeyNonInsertMode(); }
|
|
|
+ } catch (e) {
|
|
|
+ cm.state.vim = undefined;
|
|
|
+ maybeInitVimState(cm);
|
|
|
+ throw e;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ handleEx: function(cm, input) {
|
|
|
+ exCommandDispatcher.processCommand(cm, input);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ function InputState() {
|
|
|
+ this.prefixRepeat = [];
|
|
|
+ this.motionRepeat = [];
|
|
|
+
|
|
|
+ this.operator = null;
|
|
|
+ this.operatorArgs = null;
|
|
|
+ this.motion = null;
|
|
|
+ this.motionArgs = null;
|
|
|
+ this.keyBuffer = []; // For matching multi-key commands.
|
|
|
+ this.registerName = null; // Defaults to the unnamed register.
|
|
|
+ }
|
|
|
+ InputState.prototype.pushRepeatDigit = function(n) {
|
|
|
+ if (!this.operator) {
|
|
|
+ this.prefixRepeat = this.prefixRepeat.concat(n);
|
|
|
+ } else {
|
|
|
+ this.motionRepeat = this.motionRepeat.concat(n);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ InputState.prototype.getRepeat = function() {
|
|
|
+ var repeat = 0;
|
|
|
+ if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
|
|
|
+ repeat = 1;
|
|
|
+ if (this.prefixRepeat.length > 0) {
|
|
|
+ repeat *= parseInt(this.prefixRepeat.join(''), 10);
|
|
|
+ }
|
|
|
+ if (this.motionRepeat.length > 0) {
|
|
|
+ repeat *= parseInt(this.motionRepeat.join(''), 10);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return repeat;
|
|
|
+ };
|
|
|
+
|
|
|
+ function clearInputState(cm, reason) {
|
|
|
+ cm.state.vim.inputState = new InputState();
|
|
|
+ CodeMirror.signal(cm, 'vim-command-done', reason);
|
|
|
+ }
|
|
|
+ function Register(text, linewise, blockwise) {
|
|
|
+ this.clear();
|
|
|
+ this.keyBuffer = [text || ''];
|
|
|
+ this.insertModeChanges = [];
|
|
|
+ this.searchQueries = [];
|
|
|
+ this.linewise = !!linewise;
|
|
|
+ this.blockwise = !!blockwise;
|
|
|
+ }
|
|
|
+ Register.prototype = {
|
|
|
+ setText: function(text, linewise, blockwise) {
|
|
|
+ this.keyBuffer = [text || ''];
|
|
|
+ this.linewise = !!linewise;
|
|
|
+ this.blockwise = !!blockwise;
|
|
|
+ },
|
|
|
+ pushText: function(text, linewise) {
|
|
|
+ if (linewise) {
|
|
|
+ if (!this.linewise) {
|
|
|
+ this.keyBuffer.push('\n');
|
|
|
+ }
|
|
|
+ this.linewise = true;
|
|
|
+ }
|
|
|
+ this.keyBuffer.push(text);
|
|
|
+ },
|
|
|
+ pushInsertModeChanges: function(changes) {
|
|
|
+ this.insertModeChanges.push(createInsertModeChanges(changes));
|
|
|
+ },
|
|
|
+ pushSearchQuery: function(query) {
|
|
|
+ this.searchQueries.push(query);
|
|
|
+ },
|
|
|
+ clear: function() {
|
|
|
+ this.keyBuffer = [];
|
|
|
+ this.insertModeChanges = [];
|
|
|
+ this.searchQueries = [];
|
|
|
+ this.linewise = false;
|
|
|
+ },
|
|
|
+ toString: function() {
|
|
|
+ return this.keyBuffer.join('');
|
|
|
+ }
|
|
|
+ };
|
|
|
+ function RegisterController(registers) {
|
|
|
+ this.registers = registers;
|
|
|
+ this.unnamedRegister = registers['"'] = new Register();
|
|
|
+ registers['.'] = new Register();
|
|
|
+ registers[':'] = new Register();
|
|
|
+ registers['/'] = new Register();
|
|
|
+ }
|
|
|
+ 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';
|
|
|
+ }
|
|
|
+ var register = this.isValidRegister(registerName) ?
|
|
|
+ this.getRegister(registerName) : null;
|
|
|
+ if (!register) {
|
|
|
+ switch (operator) {
|
|
|
+ case 'yank':
|
|
|
+ this.registers['0'] = new Register(text, linewise, blockwise);
|
|
|
+ break;
|
|
|
+ case 'delete':
|
|
|
+ case 'change':
|
|
|
+ if (text.indexOf('\n') == -1) {
|
|
|
+ this.registers['-'] = new Register(text, linewise);
|
|
|
+ } else {
|
|
|
+ this.shiftNumericRegisters_();
|
|
|
+ this.registers['1'] = new Register(text, linewise);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ this.unnamedRegister.setText(text, linewise, blockwise);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var append = isUpperCase(registerName);
|
|
|
+ if (append) {
|
|
|
+ register.pushText(text, linewise);
|
|
|
} else {
|
|
|
- while (str.ch && !nonWordRe.test(str.ch))
|
|
|
- str.next();
|
|
|
- }
|
|
|
- str.ch && str.prev();
|
|
|
- return {column: str.col, row: str.row};
|
|
|
- }),
|
|
|
- "E": new Motion(function(editor) {
|
|
|
- var str = new StringStream(editor);
|
|
|
- str.next();
|
|
|
- while(str.ch && !(!whiteRe.test(str.ch) && whiteRe.test(str.peek(1))))
|
|
|
- str.next();
|
|
|
-
|
|
|
- return {column: str.col, row: str.row};
|
|
|
- }),
|
|
|
-
|
|
|
- "l": {
|
|
|
- nav: function(editor) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- var col = pos.column;
|
|
|
- var lineLen = editor.session.getLine(pos.row).length;
|
|
|
- if (lineLen && col !== lineLen)
|
|
|
- editor.navigateRight();
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- var col = pos.column;
|
|
|
- var lineLen = editor.session.getLine(pos.row).length;
|
|
|
- if (lineLen && col !== lineLen) //In selection mode you can select the newline
|
|
|
- editor.selection.selectRight();
|
|
|
+ register.setText(text, linewise, blockwise);
|
|
|
}
|
|
|
- },
|
|
|
- "h": {
|
|
|
- nav: function(editor) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- if (pos.column > 0)
|
|
|
- editor.navigateLeft();
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- if (pos.column > 0)
|
|
|
- editor.selection.selectLeft();
|
|
|
+ this.unnamedRegister.setText(register.toString(), linewise);
|
|
|
+ },
|
|
|
+ getRegister: function(name) {
|
|
|
+ if (!this.isValidRegister(name)) {
|
|
|
+ return this.unnamedRegister;
|
|
|
}
|
|
|
- },
|
|
|
- "H": {
|
|
|
- nav: function(editor) {
|
|
|
- var row = editor.renderer.getScrollTopRow();
|
|
|
- editor.moveCursorTo(row);
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- var row = editor.renderer.getScrollTopRow();
|
|
|
- editor.selection.selectTo(row);
|
|
|
+ name = name.toLowerCase();
|
|
|
+ if (!this.registers[name]) {
|
|
|
+ this.registers[name] = new Register();
|
|
|
}
|
|
|
- },
|
|
|
- "M": {
|
|
|
- nav: function(editor) {
|
|
|
- var topRow = editor.renderer.getScrollTopRow();
|
|
|
- var bottomRow = editor.renderer.getScrollBottomRow();
|
|
|
- var row = topRow + ((bottomRow - topRow) / 2);
|
|
|
- editor.moveCursorTo(row);
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- var topRow = editor.renderer.getScrollTopRow();
|
|
|
- var bottomRow = editor.renderer.getScrollBottomRow();
|
|
|
- var row = topRow + ((bottomRow - topRow) / 2);
|
|
|
- editor.selection.selectTo(row);
|
|
|
+ return this.registers[name];
|
|
|
+ },
|
|
|
+ isValidRegister: function(name) {
|
|
|
+ return name && inArray(name, validRegisters);
|
|
|
+ },
|
|
|
+ shiftNumericRegisters_: function() {
|
|
|
+ for (var i = 9; i >= 2; i--) {
|
|
|
+ this.registers[i] = this.getRegister('' + (i - 1));
|
|
|
}
|
|
|
- },
|
|
|
- "L": {
|
|
|
- nav: function(editor) {
|
|
|
- var row = editor.renderer.getScrollBottomRow();
|
|
|
- editor.moveCursorTo(row);
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- var row = editor.renderer.getScrollBottomRow();
|
|
|
- editor.selection.selectTo(row);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ function HistoryController() {
|
|
|
+ this.historyBuffer = [];
|
|
|
+ this.iterator;
|
|
|
+ this.initialPrefix = null;
|
|
|
+ }
|
|
|
+ HistoryController.prototype = {
|
|
|
+ nextMatch: function (input, up) {
|
|
|
+ var historyBuffer = this.historyBuffer;
|
|
|
+ var dir = up ? -1 : 1;
|
|
|
+ if (this.initialPrefix === null) this.initialPrefix = input;
|
|
|
+ for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
|
|
|
+ var element = historyBuffer[i];
|
|
|
+ for (var j = 0; j <= element.length; j++) {
|
|
|
+ if (this.initialPrefix == element.substring(0, j)) {
|
|
|
+ this.iterator = i;
|
|
|
+ return element;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "k": {
|
|
|
- nav: function(editor) {
|
|
|
- editor.navigateUp();
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- editor.selection.selectUp();
|
|
|
+ if (i >= historyBuffer.length) {
|
|
|
+ this.iterator = historyBuffer.length;
|
|
|
+ return this.initialPrefix;
|
|
|
}
|
|
|
- },
|
|
|
- "j": {
|
|
|
- nav: function(editor) {
|
|
|
- editor.navigateDown();
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- editor.selection.selectDown();
|
|
|
+ if (i < 0 ) return input;
|
|
|
+ },
|
|
|
+ pushInput: function(input) {
|
|
|
+ var index = this.historyBuffer.indexOf(input);
|
|
|
+ if (index > -1) this.historyBuffer.splice(index, 1);
|
|
|
+ if (input.length) this.historyBuffer.push(input);
|
|
|
+ },
|
|
|
+ reset: function() {
|
|
|
+ this.initialPrefix = null;
|
|
|
+ this.iterator = this.historyBuffer.length;
|
|
|
+ }
|
|
|
+ };
|
|
|
+ var commandDispatcher = {
|
|
|
+ matchCommand: function(keys, keyMap, inputState, context) {
|
|
|
+ var matches = commandMatches(keys, keyMap, context, inputState);
|
|
|
+ if (!matches.full && !matches.partial) {
|
|
|
+ return {type: 'none'};
|
|
|
+ } else if (!matches.full && matches.partial) {
|
|
|
+ return {type: 'partial'};
|
|
|
}
|
|
|
- },
|
|
|
|
|
|
- "i": {
|
|
|
- param: true,
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- switch (param) {
|
|
|
- case "w":
|
|
|
- editor.selection.selectWord();
|
|
|
- break;
|
|
|
- case "W":
|
|
|
- editor.selection.selectAWord();
|
|
|
- break;
|
|
|
- case "(":
|
|
|
- case "{":
|
|
|
- case "[":
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var end = editor.session.$findClosingBracket(param, cursor, /paren/);
|
|
|
- if (!end)
|
|
|
- return;
|
|
|
- var start = editor.session.$findOpeningBracket(editor.session.$brackets[param], cursor, /paren/);
|
|
|
- if (!start)
|
|
|
- return;
|
|
|
- start.column ++;
|
|
|
- editor.selection.setSelectionRange(Range.fromPoints(start, end));
|
|
|
- break;
|
|
|
- case "'":
|
|
|
- case '"':
|
|
|
- case "/":
|
|
|
- var end = find(editor, param, 1);
|
|
|
- if (!end)
|
|
|
- return;
|
|
|
- var start = find(editor, param, -1);
|
|
|
- if (!start)
|
|
|
- return;
|
|
|
- editor.selection.setSelectionRange(Range.fromPoints(start.end, end.start));
|
|
|
- break;
|
|
|
+ var bestMatch;
|
|
|
+ for (var i = 0; i < matches.full.length; i++) {
|
|
|
+ var match = matches.full[i];
|
|
|
+ if (!bestMatch) {
|
|
|
+ bestMatch = match;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (bestMatch.keys.slice(-11) == '<character>') {
|
|
|
+ inputState.selectedCharacter = lastChar(keys);
|
|
|
+ }
|
|
|
+ return {type: 'full', command: bestMatch};
|
|
|
+ },
|
|
|
+ processCommand: function(cm, vim, command) {
|
|
|
+ vim.inputState.repeatOverride = command.repeatOverride;
|
|
|
+ switch (command.type) {
|
|
|
+ case 'motion':
|
|
|
+ this.processMotion(cm, vim, command);
|
|
|
+ break;
|
|
|
+ case 'operator':
|
|
|
+ this.processOperator(cm, vim, command);
|
|
|
+ break;
|
|
|
+ case 'operatorMotion':
|
|
|
+ this.processOperatorMotion(cm, vim, command);
|
|
|
+ break;
|
|
|
+ case 'action':
|
|
|
+ this.processAction(cm, vim, command);
|
|
|
+ break;
|
|
|
+ case 'search':
|
|
|
+ this.processSearch(cm, vim, command);
|
|
|
+ clearInputState(cm);
|
|
|
+ break;
|
|
|
+ case 'ex':
|
|
|
+ case 'keyToEx':
|
|
|
+ this.processEx(cm, vim, command);
|
|
|
+ clearInputState(cm);
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ processMotion: function(cm, vim, command) {
|
|
|
+ vim.inputState.motion = command.motion;
|
|
|
+ vim.inputState.motionArgs = copyArgs(command.motionArgs);
|
|
|
+ this.evalInput(cm, vim);
|
|
|
+ },
|
|
|
+ processOperator: function(cm, vim, command) {
|
|
|
+ var inputState = vim.inputState;
|
|
|
+ if (inputState.operator) {
|
|
|
+ if (inputState.operator == command.operator) {
|
|
|
+ inputState.motion = 'expandToLine';
|
|
|
+ inputState.motionArgs = { linewise: true };
|
|
|
+ this.evalInput(cm, vim);
|
|
|
+ return;
|
|
|
+ } else {
|
|
|
+ clearInputState(cm);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ inputState.operator = command.operator;
|
|
|
+ inputState.operatorArgs = copyArgs(command.operatorArgs);
|
|
|
+ if (vim.visualMode) {
|
|
|
+ this.evalInput(cm, vim);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ processOperatorMotion: function(cm, vim, command) {
|
|
|
+ var visualMode = vim.visualMode;
|
|
|
+ var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
|
|
|
+ if (operatorMotionArgs) {
|
|
|
+ if (visualMode && operatorMotionArgs.visualLine) {
|
|
|
+ vim.visualLine = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.processOperator(cm, vim, command);
|
|
|
+ if (!visualMode) {
|
|
|
+ this.processMotion(cm, vim, command);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ processAction: function(cm, vim, command) {
|
|
|
+ var inputState = vim.inputState;
|
|
|
+ var repeat = inputState.getRepeat();
|
|
|
+ var repeatIsExplicit = !!repeat;
|
|
|
+ var actionArgs = copyArgs(command.actionArgs) || {};
|
|
|
+ if (inputState.selectedCharacter) {
|
|
|
+ actionArgs.selectedCharacter = inputState.selectedCharacter;
|
|
|
+ }
|
|
|
+ if (command.operator) {
|
|
|
+ this.processOperator(cm, vim, command);
|
|
|
+ }
|
|
|
+ if (command.motion) {
|
|
|
+ this.processMotion(cm, vim, command);
|
|
|
+ }
|
|
|
+ if (command.motion || command.operator) {
|
|
|
+ this.evalInput(cm, vim);
|
|
|
+ }
|
|
|
+ actionArgs.repeat = repeat || 1;
|
|
|
+ actionArgs.repeatIsExplicit = repeatIsExplicit;
|
|
|
+ actionArgs.registerName = inputState.registerName;
|
|
|
+ clearInputState(cm);
|
|
|
+ vim.lastMotion = null;
|
|
|
+ if (command.isEdit) {
|
|
|
+ this.recordLastEdit(vim, inputState, command);
|
|
|
+ }
|
|
|
+ actions[command.action](cm, actionArgs, vim);
|
|
|
+ },
|
|
|
+ processSearch: function(cm, vim, command) {
|
|
|
+ if (!cm.getSearchCursor) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var forward = command.searchArgs.forward;
|
|
|
+ var wholeWordOnly = command.searchArgs.wholeWordOnly;
|
|
|
+ getSearchState(cm).setReversed(!forward);
|
|
|
+ var promptPrefix = (forward) ? '/' : '?';
|
|
|
+ var originalQuery = getSearchState(cm).getQuery();
|
|
|
+ var originalScrollPos = cm.getScrollInfo();
|
|
|
+ function handleQuery(query, ignoreCase, smartCase) {
|
|
|
+ vimGlobalState.searchHistoryController.pushInput(query);
|
|
|
+ vimGlobalState.searchHistoryController.reset();
|
|
|
+ try {
|
|
|
+ updateSearchQuery(cm, query, ignoreCase, smartCase);
|
|
|
+ } catch (e) {
|
|
|
+ showConfirm(cm, 'Invalid regex: ' + query);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ commandDispatcher.processMotion(cm, vim, {
|
|
|
+ type: 'motion',
|
|
|
+ motion: 'findNext',
|
|
|
+ motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ function onPromptClose(query) {
|
|
|
+ cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
|
|
|
+ handleQuery(query, true /** ignoreCase */, true /** smartCase */);
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (macroModeState.isRecording) {
|
|
|
+ logSearchQuery(macroModeState, query);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function onPromptKeyUp(e, query, close) {
|
|
|
+ var keyName = CodeMirror.keyName(e), up;
|
|
|
+ if (keyName == 'Up' || keyName == 'Down') {
|
|
|
+ up = keyName == 'Up' ? true : false;
|
|
|
+ query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
|
|
|
+ close(query);
|
|
|
+ } else {
|
|
|
+ if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
|
|
|
+ vimGlobalState.searchHistoryController.reset();
|
|
|
+ }
|
|
|
+ var parsedQuery;
|
|
|
+ try {
|
|
|
+ parsedQuery = updateSearchQuery(cm, query,
|
|
|
+ true /** ignoreCase */, true /** smartCase */);
|
|
|
+ } catch (e) {
|
|
|
+ }
|
|
|
+ if (parsedQuery) {
|
|
|
+ cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
|
|
|
+ } else {
|
|
|
+ clearSearchHighlight(cm);
|
|
|
+ cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function onPromptKeyDown(e, query, close) {
|
|
|
+ var keyName = CodeMirror.keyName(e);
|
|
|
+ if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
|
|
|
+ vimGlobalState.searchHistoryController.pushInput(query);
|
|
|
+ vimGlobalState.searchHistoryController.reset();
|
|
|
+ updateSearchQuery(cm, originalQuery);
|
|
|
+ clearSearchHighlight(cm);
|
|
|
+ cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
|
|
|
+ CodeMirror.e_stop(e);
|
|
|
+ close();
|
|
|
+ cm.focus();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ switch (command.searchArgs.querySrc) {
|
|
|
+ case 'prompt':
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (macroModeState.isPlaying) {
|
|
|
+ var query = macroModeState.replaySearchQueries.shift();
|
|
|
+ handleQuery(query, true /** ignoreCase */, false /** smartCase */);
|
|
|
+ } else {
|
|
|
+ showPrompt(cm, {
|
|
|
+ onClose: onPromptClose,
|
|
|
+ prefix: promptPrefix,
|
|
|
+ desc: searchPromptDesc,
|
|
|
+ onKeyUp: onPromptKeyUp,
|
|
|
+ onKeyDown: onPromptKeyDown
|
|
|
+ });
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case 'wordUnderCursor':
|
|
|
+ var word = expandWordUnderCursor(cm, false /** inclusive */,
|
|
|
+ true /** forward */, false /** bigWord */,
|
|
|
+ true /** noSymbol */);
|
|
|
+ var isKeyword = true;
|
|
|
+ if (!word) {
|
|
|
+ word = expandWordUnderCursor(cm, false /** inclusive */,
|
|
|
+ true /** forward */, false /** bigWord */,
|
|
|
+ false /** noSymbol */);
|
|
|
+ isKeyword = false;
|
|
|
}
|
|
|
+ if (!word) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var query = cm.getLine(word.start.line).substring(word.start.ch,
|
|
|
+ word.end.ch);
|
|
|
+ if (isKeyword && wholeWordOnly) {
|
|
|
+ query = '\\b' + query + '\\b';
|
|
|
+ } else {
|
|
|
+ query = escapeRegex(query);
|
|
|
+ }
|
|
|
+ vimGlobalState.jumpList.cachedCursor = cm.getCursor();
|
|
|
+ cm.setCursor(word.start);
|
|
|
+
|
|
|
+ handleQuery(query, true /** ignoreCase */, false /** smartCase */);
|
|
|
+ break;
|
|
|
}
|
|
|
- },
|
|
|
- "a": {
|
|
|
- param: true,
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- switch (param) {
|
|
|
- case "w":
|
|
|
- editor.selection.selectAWord();
|
|
|
- break;
|
|
|
- case "W":
|
|
|
- editor.selection.selectAWord();
|
|
|
- break;
|
|
|
- case ")":
|
|
|
- case "}":
|
|
|
- case "]":
|
|
|
- param = editor.session.$brackets[param];
|
|
|
- case "(":
|
|
|
- case "{":
|
|
|
- case "[":
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var end = editor.session.$findClosingBracket(param, cursor, /paren/);
|
|
|
- if (!end)
|
|
|
- return;
|
|
|
- var start = editor.session.$findOpeningBracket(editor.session.$brackets[param], cursor, /paren/);
|
|
|
- if (!start)
|
|
|
- return;
|
|
|
- end.column ++;
|
|
|
- editor.selection.setSelectionRange(Range.fromPoints(start, end));
|
|
|
- break;
|
|
|
- case "'":
|
|
|
- case "\"":
|
|
|
- case "/":
|
|
|
- var end = find(editor, param, 1);
|
|
|
- if (!end)
|
|
|
- return;
|
|
|
- var start = find(editor, param, -1);
|
|
|
- if (!start)
|
|
|
- return;
|
|
|
- end.column ++;
|
|
|
- editor.selection.setSelectionRange(Range.fromPoints(start.start, end.end));
|
|
|
- break;
|
|
|
+ },
|
|
|
+ processEx: function(cm, vim, command) {
|
|
|
+ function onPromptClose(input) {
|
|
|
+ vimGlobalState.exCommandHistoryController.pushInput(input);
|
|
|
+ vimGlobalState.exCommandHistoryController.reset();
|
|
|
+ exCommandDispatcher.processCommand(cm, input);
|
|
|
+ }
|
|
|
+ function onPromptKeyDown(e, input, close) {
|
|
|
+ var keyName = CodeMirror.keyName(e), up;
|
|
|
+ if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
|
|
|
+ vimGlobalState.exCommandHistoryController.pushInput(input);
|
|
|
+ vimGlobalState.exCommandHistoryController.reset();
|
|
|
+ CodeMirror.e_stop(e);
|
|
|
+ close();
|
|
|
+ cm.focus();
|
|
|
+ }
|
|
|
+ if (keyName == 'Up' || keyName == 'Down') {
|
|
|
+ up = keyName == 'Up' ? true : false;
|
|
|
+ input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
|
|
|
+ close(input);
|
|
|
+ } else {
|
|
|
+ if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
|
|
|
+ vimGlobalState.exCommandHistoryController.reset();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (command.type == 'keyToEx') {
|
|
|
+ exCommandDispatcher.processCommand(cm, command.exArgs.input);
|
|
|
+ } else {
|
|
|
+ if (vim.visualMode) {
|
|
|
+ showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
|
|
|
+ onKeyDown: onPromptKeyDown});
|
|
|
+ } else {
|
|
|
+ showPrompt(cm, { onClose: onPromptClose, prefix: ':',
|
|
|
+ onKeyDown: onPromptKeyDown});
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ evalInput: function(cm, vim) {
|
|
|
+ var inputState = vim.inputState;
|
|
|
+ var motion = inputState.motion;
|
|
|
+ var motionArgs = inputState.motionArgs || {};
|
|
|
+ var operator = inputState.operator;
|
|
|
+ var operatorArgs = inputState.operatorArgs || {};
|
|
|
+ var registerName = inputState.registerName;
|
|
|
+ var sel = vim.sel;
|
|
|
+ var origHead = copyCursor(vim.visualMode ? sel.head: cm.getCursor('head'));
|
|
|
+ var origAnchor = copyCursor(vim.visualMode ? sel.anchor : cm.getCursor('anchor'));
|
|
|
+ var oldHead = copyCursor(origHead);
|
|
|
+ var oldAnchor = copyCursor(origAnchor);
|
|
|
+ var newHead, newAnchor;
|
|
|
+ var repeat;
|
|
|
+ if (operator) {
|
|
|
+ this.recordLastEdit(vim, inputState);
|
|
|
+ }
|
|
|
+ if (inputState.repeatOverride !== undefined) {
|
|
|
+ repeat = inputState.repeatOverride;
|
|
|
+ } else {
|
|
|
+ repeat = inputState.getRepeat();
|
|
|
+ }
|
|
|
+ if (repeat > 0 && motionArgs.explicitRepeat) {
|
|
|
+ motionArgs.repeatIsExplicit = true;
|
|
|
+ } else if (motionArgs.noRepeat ||
|
|
|
+ (!motionArgs.explicitRepeat && repeat === 0)) {
|
|
|
+ repeat = 1;
|
|
|
+ motionArgs.repeatIsExplicit = false;
|
|
|
+ }
|
|
|
+ if (inputState.selectedCharacter) {
|
|
|
+ motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
|
|
|
+ inputState.selectedCharacter;
|
|
|
+ }
|
|
|
+ motionArgs.repeat = repeat;
|
|
|
+ clearInputState(cm);
|
|
|
+ if (motion) {
|
|
|
+ var motionResult = motions[motion](cm, origHead, motionArgs, vim);
|
|
|
+ vim.lastMotion = motions[motion];
|
|
|
+ if (!motionResult) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (motionArgs.toJumplist) {
|
|
|
+ var jumpList = vimGlobalState.jumpList;
|
|
|
+ var cachedCursor = jumpList.cachedCursor;
|
|
|
+ if (cachedCursor) {
|
|
|
+ recordJumpPosition(cm, cachedCursor, motionResult);
|
|
|
+ delete jumpList.cachedCursor;
|
|
|
+ } else {
|
|
|
+ recordJumpPosition(cm, origHead, motionResult);
|
|
|
}
|
|
|
+ }
|
|
|
+ if (motionResult instanceof Array) {
|
|
|
+ newAnchor = motionResult[0];
|
|
|
+ newHead = motionResult[1];
|
|
|
+ } else {
|
|
|
+ newHead = motionResult;
|
|
|
+ }
|
|
|
+ if (!newHead) {
|
|
|
+ newHead = copyCursor(origHead);
|
|
|
+ }
|
|
|
+ if (vim.visualMode) {
|
|
|
+ newHead = clipCursorToContent(cm, newHead, true);
|
|
|
+ if (newAnchor) {
|
|
|
+ newAnchor = clipCursorToContent(cm, newAnchor, true);
|
|
|
+ }
|
|
|
+ newAnchor = newAnchor || oldAnchor;
|
|
|
+ sel.anchor = newAnchor;
|
|
|
+ sel.head = newHead;
|
|
|
+ updateCmSelection(cm);
|
|
|
+ updateMark(cm, vim, '<',
|
|
|
+ cursorIsBefore(newAnchor, newHead) ? newAnchor
|
|
|
+ : newHead);
|
|
|
+ updateMark(cm, vim, '>',
|
|
|
+ cursorIsBefore(newAnchor, newHead) ? newHead
|
|
|
+ : newAnchor);
|
|
|
+ } else if (!operator) {
|
|
|
+ newHead = clipCursorToContent(cm, newHead);
|
|
|
+ cm.setCursor(newHead.line, newHead.ch);
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
+ if (operator) {
|
|
|
+ if (operatorArgs.lastSel) {
|
|
|
+ newAnchor = oldAnchor;
|
|
|
+ var lastSel = operatorArgs.lastSel;
|
|
|
+ var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
|
|
|
+ var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
|
|
|
+ if (lastSel.visualLine) {
|
|
|
+ newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
|
|
|
+ } else if (lastSel.visualBlock) {
|
|
|
+ newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
|
|
|
+ } else if (lastSel.head.line == lastSel.anchor.line) {
|
|
|
+ newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
|
|
|
+ } else {
|
|
|
+ newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
|
|
|
+ }
|
|
|
+ vim.visualMode = true;
|
|
|
+ vim.visualLine = lastSel.visualLine;
|
|
|
+ vim.visualBlock = lastSel.visualBlock;
|
|
|
+ sel = vim.sel = {
|
|
|
+ anchor: newAnchor,
|
|
|
+ head: newHead
|
|
|
+ };
|
|
|
+ updateCmSelection(cm);
|
|
|
+ } else if (vim.visualMode) {
|
|
|
+ operatorArgs.lastSel = {
|
|
|
+ anchor: copyCursor(sel.anchor),
|
|
|
+ head: copyCursor(sel.head),
|
|
|
+ visualBlock: vim.visualBlock,
|
|
|
+ visualLine: vim.visualLine
|
|
|
+ };
|
|
|
+ }
|
|
|
+ var curStart, curEnd, linewise, mode;
|
|
|
+ var cmSel;
|
|
|
+ if (vim.visualMode) {
|
|
|
+ curStart = cursorMin(sel.head, sel.anchor);
|
|
|
+ curEnd = cursorMax(sel.head, sel.anchor);
|
|
|
+ linewise = vim.visualLine || operatorArgs.linewise;
|
|
|
+ mode = vim.visualBlock ? 'block' :
|
|
|
+ linewise ? 'line' :
|
|
|
+ 'char';
|
|
|
+ cmSel = makeCmSelection(cm, {
|
|
|
+ anchor: curStart,
|
|
|
+ head: curEnd
|
|
|
+ }, mode);
|
|
|
+ if (linewise) {
|
|
|
+ var ranges = cmSel.ranges;
|
|
|
+ if (mode == 'block') {
|
|
|
+ for (var i = 0; i < ranges.length; i++) {
|
|
|
+ ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
|
|
|
+ }
|
|
|
+ } else if (mode == 'line') {
|
|
|
+ ranges[0].head = Pos(ranges[0].head.line + 1, 0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ curStart = copyCursor(newAnchor || oldAnchor);
|
|
|
+ curEnd = copyCursor(newHead || oldHead);
|
|
|
+ if (cursorIsBefore(curEnd, curStart)) {
|
|
|
+ var tmp = curStart;
|
|
|
+ curStart = curEnd;
|
|
|
+ curEnd = tmp;
|
|
|
+ }
|
|
|
+ linewise = motionArgs.linewise || operatorArgs.linewise;
|
|
|
+ if (linewise) {
|
|
|
+ expandSelectionToLine(cm, curStart, curEnd);
|
|
|
+ } else if (motionArgs.forward) {
|
|
|
+ clipToLine(cm, curStart, curEnd);
|
|
|
+ }
|
|
|
+ mode = 'char';
|
|
|
+ var exclusive = !motionArgs.inclusive || linewise;
|
|
|
+ cmSel = makeCmSelection(cm, {
|
|
|
+ anchor: curStart,
|
|
|
+ head: curEnd
|
|
|
+ }, mode, exclusive);
|
|
|
+ }
|
|
|
+ cm.setSelections(cmSel.ranges, cmSel.primary);
|
|
|
+ vim.lastMotion = null;
|
|
|
+ operatorArgs.repeat = repeat; // For indent in visual mode.
|
|
|
+ operatorArgs.registerName = registerName;
|
|
|
+ operatorArgs.linewise = linewise;
|
|
|
+ var operatorMoveTo = operators[operator](
|
|
|
+ cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
|
|
|
+ if (vim.visualMode) {
|
|
|
+ exitVisualMode(cm);
|
|
|
+ }
|
|
|
+ if (operatorMoveTo) {
|
|
|
+ cm.setCursor(operatorMoveTo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ recordLastEdit: function(vim, inputState, actionCommand) {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (macroModeState.isPlaying) { return; }
|
|
|
+ vim.lastEditInputState = inputState;
|
|
|
+ vim.lastEditActionCommand = actionCommand;
|
|
|
+ macroModeState.lastInsertModeChanges.changes = [];
|
|
|
+ macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
|
|
|
+ }
|
|
|
+ };
|
|
|
+ var motions = {
|
|
|
+ moveToTopLine: function(cm, _head, motionArgs) {
|
|
|
+ var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
|
|
|
+ return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
|
|
|
+ },
|
|
|
+ moveToMiddleLine: function(cm) {
|
|
|
+ var range = getUserVisibleLines(cm);
|
|
|
+ var line = Math.floor((range.top + range.bottom) * 0.5);
|
|
|
+ return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
|
|
|
+ },
|
|
|
+ moveToBottomLine: function(cm, _head, motionArgs) {
|
|
|
+ var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
|
|
|
+ return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
|
|
|
+ },
|
|
|
+ expandToLine: function(_cm, head, motionArgs) {
|
|
|
+ var cur = head;
|
|
|
+ return Pos(cur.line + motionArgs.repeat - 1, Infinity);
|
|
|
+ },
|
|
|
+ findNext: function(cm, _head, motionArgs) {
|
|
|
+ var state = getSearchState(cm);
|
|
|
+ var query = state.getQuery();
|
|
|
+ if (!query) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var prev = !motionArgs.forward;
|
|
|
+ prev = (state.isReversed()) ? !prev : prev;
|
|
|
+ highlightSearchMatches(cm, query);
|
|
|
+ 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();
|
|
|
+ return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ },
|
|
|
+ moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
|
|
|
+ if (vim.visualBlock && motionArgs.sameLine) {
|
|
|
+ var sel = vim.sel;
|
|
|
+ return [
|
|
|
+ clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
|
|
|
+ clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
|
|
|
+ ];
|
|
|
+ } else {
|
|
|
+ return ([vim.sel.head, vim.sel.anchor]);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ jumpToMark: function(cm, head, motionArgs, vim) {
|
|
|
+ var best = head;
|
|
|
+ for (var i = 0; i < motionArgs.repeat; i++) {
|
|
|
+ var cursor = best;
|
|
|
+ for (var key in vim.marks) {
|
|
|
+ if (!isLowerCase(key)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ var mark = vim.marks[key].find();
|
|
|
+ var isWrongDirection = (motionArgs.forward) ?
|
|
|
+ cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
|
|
|
+
|
|
|
+ if (isWrongDirection) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (motionArgs.linewise && (mark.line == cursor.line)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
- "f": new Motion({
|
|
|
- param: true,
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel, isRepeat) {
|
|
|
- if (param == "space") param = " ";
|
|
|
- if (!isRepeat)
|
|
|
- LAST_SEARCH_MOTION = {ch: "f", param: param};
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var column = util.getRightNthChar(editor, cursor, param, count || 1);
|
|
|
-
|
|
|
- if (typeof column === "number") {
|
|
|
- cursor.column += column + (isSel ? 2 : 1);
|
|
|
- return cursor;
|
|
|
+ var equal = cursorEqual(cursor, best);
|
|
|
+ var between = (motionArgs.forward) ?
|
|
|
+ cursorIsBetween(cursor, mark, best) :
|
|
|
+ cursorIsBetween(best, mark, cursor);
|
|
|
+
|
|
|
+ if (equal || between) {
|
|
|
+ best = mark;
|
|
|
}
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (motionArgs.linewise) {
|
|
|
+ best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
|
|
|
+ }
|
|
|
+ return best;
|
|
|
+ },
|
|
|
+ moveByCharacters: function(_cm, head, motionArgs) {
|
|
|
+ var cur = head;
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
|
|
|
+ return Pos(cur.line, ch);
|
|
|
+ },
|
|
|
+ moveByLines: function(cm, head, motionArgs, vim) {
|
|
|
+ var cur = head;
|
|
|
+ var endCh = cur.ch;
|
|
|
+ switch (vim.lastMotion) {
|
|
|
+ case this.moveByLines:
|
|
|
+ case this.moveByDisplayLines:
|
|
|
+ case this.moveByScroll:
|
|
|
+ case this.moveToColumn:
|
|
|
+ case this.moveToEol:
|
|
|
+ endCh = vim.lastHPos;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ vim.lastHPos = endCh;
|
|
|
+ }
|
|
|
+ var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
|
|
|
+ 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 (motionArgs.toFirstChar){
|
|
|
+ endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
|
|
|
+ vim.lastHPos = endCh;
|
|
|
+ }
|
|
|
+ vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
|
|
|
+ return Pos(line, endCh);
|
|
|
+ },
|
|
|
+ moveByDisplayLines: function(cm, head, motionArgs, vim) {
|
|
|
+ var cur = head;
|
|
|
+ switch (vim.lastMotion) {
|
|
|
+ case this.moveByDisplayLines:
|
|
|
+ case this.moveByScroll:
|
|
|
+ case this.moveByLines:
|
|
|
+ case this.moveToColumn:
|
|
|
+ case this.moveToEol:
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ vim.lastHSPos = cm.charCoords(cur,'div').left;
|
|
|
}
|
|
|
- }),
|
|
|
- "F": new Motion({
|
|
|
- param: true,
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel, isRepeat) {
|
|
|
- if (param == "space") param = " ";
|
|
|
- if (!isRepeat)
|
|
|
- LAST_SEARCH_MOTION = {ch: "F", param: param};
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var column = util.getLeftNthChar(editor, cursor, param, count || 1);
|
|
|
-
|
|
|
- if (typeof column === "number") {
|
|
|
- cursor.column -= column + 1;
|
|
|
- return cursor;
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
|
|
|
+ if (res.hitSide) {
|
|
|
+ if (motionArgs.forward) {
|
|
|
+ var lastCharCoords = cm.charCoords(res, 'div');
|
|
|
+ var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
|
|
|
+ var res = cm.coordsChar(goalCoords, 'div');
|
|
|
+ } else {
|
|
|
+ var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
|
|
|
+ resCoords.left = vim.lastHSPos;
|
|
|
+ res = cm.coordsChar(resCoords, 'div');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vim.lastHPos = res.ch;
|
|
|
+ return res;
|
|
|
+ },
|
|
|
+ moveByPage: function(cm, head, motionArgs) {
|
|
|
+ var curStart = head;
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
|
|
|
+ },
|
|
|
+ moveByParagraph: function(cm, head, motionArgs) {
|
|
|
+ var line = head.line;
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ var inc = motionArgs.forward ? 1 : -1;
|
|
|
+ for (var i = 0; i < repeat; i++) {
|
|
|
+ if ((!motionArgs.forward && line === cm.firstLine() ) ||
|
|
|
+ (motionArgs.forward && line == cm.lastLine())) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ line += inc;
|
|
|
+ while (line !== cm.firstLine() && line != cm.lastLine() && cm.getLine(line)) {
|
|
|
+ line += inc;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return Pos(line, 0);
|
|
|
+ },
|
|
|
+ moveByScroll: function(cm, head, motionArgs, vim) {
|
|
|
+ var scrollbox = cm.getScrollInfo();
|
|
|
+ var curEnd = null;
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ if (!repeat) {
|
|
|
+ repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
|
|
|
+ }
|
|
|
+ var orig = cm.charCoords(head, 'local');
|
|
|
+ motionArgs.repeat = repeat;
|
|
|
+ var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
|
|
|
+ if (!curEnd) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ var dest = cm.charCoords(curEnd, 'local');
|
|
|
+ cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
|
|
|
+ return curEnd;
|
|
|
+ },
|
|
|
+ moveByWords: function(cm, head, motionArgs) {
|
|
|
+ return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
|
|
|
+ !!motionArgs.wordEnd, !!motionArgs.bigWord);
|
|
|
+ },
|
|
|
+ moveTillCharacter: function(cm, _head, motionArgs) {
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
|
|
|
+ motionArgs.selectedCharacter);
|
|
|
+ var increment = motionArgs.forward ? -1 : 1;
|
|
|
+ recordLastCharacterSearch(increment, motionArgs);
|
|
|
+ if (!curEnd) return null;
|
|
|
+ curEnd.ch += increment;
|
|
|
+ return curEnd;
|
|
|
+ },
|
|
|
+ moveToCharacter: function(cm, head, motionArgs) {
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ recordLastCharacterSearch(0, motionArgs);
|
|
|
+ return moveToCharacter(cm, repeat, motionArgs.forward,
|
|
|
+ motionArgs.selectedCharacter) || head;
|
|
|
+ },
|
|
|
+ moveToSymbol: function(cm, head, motionArgs) {
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ return findSymbol(cm, repeat, motionArgs.forward,
|
|
|
+ motionArgs.selectedCharacter) || head;
|
|
|
+ },
|
|
|
+ moveToColumn: function(cm, head, motionArgs, vim) {
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ vim.lastHPos = repeat - 1;
|
|
|
+ vim.lastHSPos = cm.charCoords(head,'div').left;
|
|
|
+ return moveToColumn(cm, repeat);
|
|
|
+ },
|
|
|
+ moveToEol: function(cm, head, motionArgs, vim) {
|
|
|
+ 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;
|
|
|
+ return retval;
|
|
|
+ },
|
|
|
+ moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
|
|
|
+ var cursor = head;
|
|
|
+ return Pos(cursor.line,
|
|
|
+ findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
|
|
|
+ },
|
|
|
+ moveToMatchedSymbol: function(cm, head) {
|
|
|
+ var cursor = head;
|
|
|
+ var line = cursor.line;
|
|
|
+ var ch = cursor.ch;
|
|
|
+ var lineText = cm.getLine(line);
|
|
|
+ var symbol;
|
|
|
+ do {
|
|
|
+ symbol = lineText.charAt(ch++);
|
|
|
+ if (symbol && isMatchableSymbol(symbol)) {
|
|
|
+ var style = cm.getTokenTypeAt(Pos(line, ch));
|
|
|
+ if (style !== "string" && style !== "comment") {
|
|
|
+ break;
|
|
|
}
|
|
|
+ }
|
|
|
+ } while (symbol);
|
|
|
+ if (symbol) {
|
|
|
+ var matched = cm.findMatchingBracket(Pos(line, ch));
|
|
|
+ return matched.to;
|
|
|
+ } else {
|
|
|
+ return cursor;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ moveToStartOfLine: function(_cm, head) {
|
|
|
+ return Pos(head.line, 0);
|
|
|
+ },
|
|
|
+ moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
|
|
|
+ var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
|
|
|
+ if (motionArgs.repeatIsExplicit) {
|
|
|
+ lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
|
|
|
+ }
|
|
|
+ return Pos(lineNum,
|
|
|
+ findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
|
|
|
+ },
|
|
|
+ textObjectManipulation: function(cm, head, motionArgs) {
|
|
|
+ var mirroredPairs = {'(': ')', ')': '(',
|
|
|
+ '{': '}', '}': '{',
|
|
|
+ '[': ']', ']': '['};
|
|
|
+ var selfPaired = {'\'': true, '"': true};
|
|
|
+
|
|
|
+ var character = motionArgs.selectedCharacter;
|
|
|
+ if (character == 'b') {
|
|
|
+ character = '(';
|
|
|
+ } else if (character == 'B') {
|
|
|
+ character = '{';
|
|
|
+ }
|
|
|
+ var inclusive = !motionArgs.textObjectInner;
|
|
|
+
|
|
|
+ var tmp;
|
|
|
+ if (mirroredPairs[character]) {
|
|
|
+ tmp = selectCompanionObject(cm, head, character, inclusive);
|
|
|
+ } else if (selfPaired[character]) {
|
|
|
+ tmp = findBeginningAndEnd(cm, head, character, inclusive);
|
|
|
+ } else if (character === 'W') {
|
|
|
+ tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
|
|
|
+ true /** bigWord */);
|
|
|
+ } else if (character === 'w') {
|
|
|
+ tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
|
|
|
+ false /** bigWord */);
|
|
|
+ } else if (character === 'p') {
|
|
|
+ tmp = expandParagraphUnderCursor(cm, inclusive, true /** forward */,
|
|
|
+ false /** bigWord */);
|
|
|
+ } else {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!cm.state.vim.visualMode) {
|
|
|
+ return [tmp.start, tmp.end];
|
|
|
+ } else {
|
|
|
+ return expandSelection(cm, tmp.start, tmp.end);
|
|
|
}
|
|
|
- }),
|
|
|
- "t": new Motion({
|
|
|
- param: true,
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel, isRepeat) {
|
|
|
- if (param == "space") param = " ";
|
|
|
- if (!isRepeat)
|
|
|
- LAST_SEARCH_MOTION = {ch: "t", param: param};
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var column = util.getRightNthChar(editor, cursor, param, count || 1);
|
|
|
-
|
|
|
- if (isRepeat && column == 0 && !(count > 1))
|
|
|
- var column = util.getRightNthChar(editor, cursor, param, 2);
|
|
|
-
|
|
|
- if (typeof column === "number") {
|
|
|
- cursor.column += column + (isSel ? 1 : 0);
|
|
|
- return cursor;
|
|
|
+ },
|
|
|
+
|
|
|
+ repeatLastCharacterSearch: function(cm, head, motionArgs) {
|
|
|
+ var lastSearch = vimGlobalState.lastChararacterSearch;
|
|
|
+ var repeat = motionArgs.repeat;
|
|
|
+ var forward = motionArgs.forward === lastSearch.forward;
|
|
|
+ var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
|
|
|
+ cm.moveH(-increment, 'char');
|
|
|
+ motionArgs.inclusive = forward ? true : false;
|
|
|
+ var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
|
|
|
+ if (!curEnd) {
|
|
|
+ cm.moveH(increment, 'char');
|
|
|
+ return head;
|
|
|
+ }
|
|
|
+ curEnd.ch += increment;
|
|
|
+ return curEnd;
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ function fillArray(val, times) {
|
|
|
+ var arr = [];
|
|
|
+ for (var i = 0; i < times; i++) {
|
|
|
+ arr.push(val);
|
|
|
+ }
|
|
|
+ return arr;
|
|
|
+ }
|
|
|
+ var operators = {
|
|
|
+ change: function(cm, args, ranges) {
|
|
|
+ var finalHead, text;
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
|
|
|
+ if (!vim.visualMode) {
|
|
|
+ var anchor = ranges[0].anchor,
|
|
|
+ head = ranges[0].head;
|
|
|
+ text = cm.getRange(anchor, head);
|
|
|
+ if (!isWhiteSpaceString(text)) {
|
|
|
+ var match = (/\s+$/).exec(text);
|
|
|
+ if (match) {
|
|
|
+ head = offsetCursor(head, 0, - match[0].length);
|
|
|
+ text = text.slice(0, - match[0].length);
|
|
|
}
|
|
|
+ }
|
|
|
+ var wasLastLine = head.line - 1 == cm.lastLine();
|
|
|
+ cm.replaceRange('', anchor, head);
|
|
|
+ if (args.linewise && !wasLastLine) {
|
|
|
+ CodeMirror.commands.newlineAndIndent(cm);
|
|
|
+ anchor.ch = null;
|
|
|
+ }
|
|
|
+ finalHead = anchor;
|
|
|
+ } else {
|
|
|
+ text = cm.getSelection();
|
|
|
+ var replacement = fillArray('', ranges.length);
|
|
|
+ cm.replaceSelections(replacement);
|
|
|
+ finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
|
|
|
}
|
|
|
- }),
|
|
|
- "T": new Motion({
|
|
|
- param: true,
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel, isRepeat) {
|
|
|
- if (param == "space") param = " ";
|
|
|
- if (!isRepeat)
|
|
|
- LAST_SEARCH_MOTION = {ch: "T", param: param};
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var column = util.getLeftNthChar(editor, cursor, param, count || 1);
|
|
|
-
|
|
|
- if (isRepeat && column == 0 && !(count > 1))
|
|
|
- var column = util.getLeftNthChar(editor, cursor, param, 2);
|
|
|
-
|
|
|
- if (typeof column === "number") {
|
|
|
- cursor.column -= column;
|
|
|
- return cursor;
|
|
|
+ vimGlobalState.registerController.pushText(
|
|
|
+ args.registerName, 'change', text,
|
|
|
+ args.linewise, ranges.length > 1);
|
|
|
+ actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
|
|
|
+ },
|
|
|
+ 'delete': function(cm, args, ranges) {
|
|
|
+ var finalHead, text;
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ if (!vim.visualBlock) {
|
|
|
+ var anchor = ranges[0].anchor,
|
|
|
+ head = ranges[0].head;
|
|
|
+ if (args.linewise &&
|
|
|
+ head.line != cm.firstLine() &&
|
|
|
+ anchor.line == cm.lastLine() &&
|
|
|
+ anchor.line == head.line - 1) {
|
|
|
+ if (anchor.line == cm.firstLine()) {
|
|
|
+ anchor.ch = 0;
|
|
|
+ } else {
|
|
|
+ anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
|
|
|
}
|
|
|
+ }
|
|
|
+ text = cm.getRange(anchor, head);
|
|
|
+ cm.replaceRange('', anchor, head);
|
|
|
+ finalHead = anchor;
|
|
|
+ if (args.linewise) {
|
|
|
+ finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ text = cm.getSelection();
|
|
|
+ var replacement = fillArray('', ranges.length);
|
|
|
+ cm.replaceSelections(replacement);
|
|
|
+ finalHead = ranges[0].anchor;
|
|
|
}
|
|
|
- }),
|
|
|
- ";": new Motion({
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel) {
|
|
|
- var ch = LAST_SEARCH_MOTION.ch;
|
|
|
- if (!ch)
|
|
|
- return;
|
|
|
- return module.exports[ch].getPos(
|
|
|
- editor, range, count, LAST_SEARCH_MOTION.param, isSel, true
|
|
|
- );
|
|
|
- }
|
|
|
- }),
|
|
|
- ",": new Motion({
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel) {
|
|
|
- var ch = LAST_SEARCH_MOTION.ch;
|
|
|
- if (!ch)
|
|
|
- return;
|
|
|
- var up = ch.toUpperCase();
|
|
|
- ch = ch === up ? ch.toLowerCase() : up;
|
|
|
-
|
|
|
- return module.exports[ch].getPos(
|
|
|
- editor, range, count, LAST_SEARCH_MOTION.param, isSel, true
|
|
|
- );
|
|
|
- }
|
|
|
- }),
|
|
|
-
|
|
|
- "^": {
|
|
|
- nav: function(editor) {
|
|
|
- editor.navigateLineStart();
|
|
|
- },
|
|
|
- sel: function(editor) {
|
|
|
- editor.selection.selectLineStart();
|
|
|
+ vimGlobalState.registerController.pushText(
|
|
|
+ args.registerName, 'delete', text,
|
|
|
+ args.linewise, vim.visualBlock);
|
|
|
+ return finalHead;
|
|
|
+ },
|
|
|
+ indent: function(cm, args, ranges) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ var startLine = ranges[0].anchor.line;
|
|
|
+ var endLine = vim.visualBlock ?
|
|
|
+ ranges[ranges.length - 1].anchor.line :
|
|
|
+ ranges[0].head.line;
|
|
|
+ var repeat = (vim.visualMode) ? args.repeat : 1;
|
|
|
+ if (args.linewise) {
|
|
|
+ endLine--;
|
|
|
}
|
|
|
- },
|
|
|
- "$": {
|
|
|
- handlesCount: true,
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- if (count > 1) {
|
|
|
- editor.navigateDown(count-1);
|
|
|
- }
|
|
|
- editor.navigateLineEnd();
|
|
|
- },
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- if (count > 1) {
|
|
|
- editor.selection.moveCursorBy(count-1, 0);
|
|
|
+ for (var i = startLine; i <= endLine; i++) {
|
|
|
+ for (var j = 0; j < repeat; j++) {
|
|
|
+ cm.indentLine(i, args.indentRight);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
|
|
|
+ },
|
|
|
+ changeCase: function(cm, args, ranges, oldAnchor, newHead) {
|
|
|
+ var selections = cm.getSelections();
|
|
|
+ var swapped = [];
|
|
|
+ var toLower = args.toLower;
|
|
|
+ for (var j = 0; j < selections.length; j++) {
|
|
|
+ var toSwap = selections[j];
|
|
|
+ var text = '';
|
|
|
+ if (toLower === true) {
|
|
|
+ text = toSwap.toLowerCase();
|
|
|
+ } else if (toLower === false) {
|
|
|
+ text = toSwap.toUpperCase();
|
|
|
+ } else {
|
|
|
+ for (var i = 0; i < toSwap.length; i++) {
|
|
|
+ var character = toSwap.charAt(i);
|
|
|
+ text += isUpperCase(character) ? character.toLowerCase() :
|
|
|
+ character.toUpperCase();
|
|
|
}
|
|
|
- editor.selection.selectLineEnd();
|
|
|
+ }
|
|
|
+ swapped.push(text);
|
|
|
}
|
|
|
- },
|
|
|
- "0": new Motion(function(ed) {
|
|
|
- return {row: ed.selection.lead.row, column: 0};
|
|
|
- }),
|
|
|
- "G": {
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- if (!count && count !== 0) { // Stupid JS
|
|
|
- count = editor.session.getLength();
|
|
|
+ cm.replaceSelections(swapped);
|
|
|
+ if (args.shouldMoveCursor){
|
|
|
+ return newHead;
|
|
|
+ } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
|
|
|
+ return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
|
|
|
+ } else if (args.linewise){
|
|
|
+ return oldAnchor;
|
|
|
+ } else {
|
|
|
+ return cursorMin(ranges[0].anchor, ranges[0].head);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ yank: function(cm, args, ranges, oldAnchor) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ var text = cm.getSelection();
|
|
|
+ var endPos = vim.visualMode
|
|
|
+ ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
|
|
|
+ : oldAnchor;
|
|
|
+ vimGlobalState.registerController.pushText(
|
|
|
+ args.registerName, 'yank',
|
|
|
+ text, args.linewise, vim.visualBlock);
|
|
|
+ return endPos;
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ var actions = {
|
|
|
+ jumpListWalk: function(cm, actionArgs, vim) {
|
|
|
+ if (vim.visualMode) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var repeat = actionArgs.repeat;
|
|
|
+ var forward = actionArgs.forward;
|
|
|
+ var jumpList = vimGlobalState.jumpList;
|
|
|
+
|
|
|
+ var mark = jumpList.move(cm, forward ? repeat : -repeat);
|
|
|
+ var markPos = mark ? mark.find() : undefined;
|
|
|
+ markPos = markPos ? markPos : cm.getCursor();
|
|
|
+ cm.setCursor(markPos);
|
|
|
+ },
|
|
|
+ scroll: function(cm, actionArgs, vim) {
|
|
|
+ if (vim.visualMode) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var repeat = actionArgs.repeat || 1;
|
|
|
+ var lineHeight = cm.defaultTextHeight();
|
|
|
+ var top = cm.getScrollInfo().top;
|
|
|
+ var delta = lineHeight * repeat;
|
|
|
+ var newPos = actionArgs.forward ? top + delta : top - delta;
|
|
|
+ var cursor = copyCursor(cm.getCursor());
|
|
|
+ var cursorCoords = cm.charCoords(cursor, 'local');
|
|
|
+ if (actionArgs.forward) {
|
|
|
+ if (newPos > cursorCoords.top) {
|
|
|
+ cursor.line += (newPos - cursorCoords.top) / lineHeight;
|
|
|
+ cursor.line = Math.ceil(cursor.line);
|
|
|
+ cm.setCursor(cursor);
|
|
|
+ cursorCoords = cm.charCoords(cursor, 'local');
|
|
|
+ cm.scrollTo(null, cursorCoords.top);
|
|
|
+ } else {
|
|
|
+ cm.scrollTo(null, newPos);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ var newBottom = newPos + cm.getScrollInfo().clientHeight;
|
|
|
+ if (newBottom < cursorCoords.bottom) {
|
|
|
+ cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
|
|
|
+ cursor.line = Math.floor(cursor.line);
|
|
|
+ cm.setCursor(cursor);
|
|
|
+ cursorCoords = cm.charCoords(cursor, 'local');
|
|
|
+ cm.scrollTo(
|
|
|
+ null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
|
|
|
+ } else {
|
|
|
+ cm.scrollTo(null, newPos);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ scrollToCursor: function(cm, actionArgs) {
|
|
|
+ var lineNum = cm.getCursor().line;
|
|
|
+ var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
|
|
|
+ var height = cm.getScrollInfo().clientHeight;
|
|
|
+ var y = charCoords.top;
|
|
|
+ var lineHeight = charCoords.bottom - y;
|
|
|
+ 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;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ cm.scrollTo(null, y);
|
|
|
+ },
|
|
|
+ replayMacro: function(cm, actionArgs, vim) {
|
|
|
+ var registerName = actionArgs.selectedCharacter;
|
|
|
+ var repeat = actionArgs.repeat;
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (registerName == '@') {
|
|
|
+ registerName = macroModeState.latestRegister;
|
|
|
+ }
|
|
|
+ while(repeat--){
|
|
|
+ executeMacroRegister(cm, vim, macroModeState, registerName);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ enterMacroRecordMode: function(cm, actionArgs) {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ var registerName = actionArgs.selectedCharacter;
|
|
|
+ macroModeState.enterMacroRecordMode(cm, registerName);
|
|
|
+ },
|
|
|
+ enterInsertMode: function(cm, actionArgs, vim) {
|
|
|
+ if (cm.getOption('readOnly')) { return; }
|
|
|
+ vim.insertMode = true;
|
|
|
+ vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
|
|
|
+ var insertAt = (actionArgs) ? actionArgs.insertAt : null;
|
|
|
+ var sel = vim.sel;
|
|
|
+ var head = actionArgs.head || cm.getCursor('head');
|
|
|
+ var height = cm.listSelections().length;
|
|
|
+ if (insertAt == 'eol') {
|
|
|
+ head = Pos(head.line, lineLength(cm, head.line));
|
|
|
+ } else if (insertAt == 'charAfter') {
|
|
|
+ head = offsetCursor(head, 0, 1);
|
|
|
+ } else if (insertAt == 'firstNonBlank') {
|
|
|
+ head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
|
|
|
+ } else if (insertAt == 'startOfSelectedArea') {
|
|
|
+ if (!vim.visualBlock) {
|
|
|
+ if (sel.head.line < sel.anchor.line) {
|
|
|
+ head = sel.head;
|
|
|
+ } else {
|
|
|
+ head = Pos(sel.anchor.line, 0);
|
|
|
}
|
|
|
- editor.gotoLine(count);
|
|
|
- },
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- if (!count && count !== 0) { // Stupid JS
|
|
|
- count = editor.session.getLength();
|
|
|
+ } else {
|
|
|
+ head = Pos(
|
|
|
+ Math.min(sel.head.line, sel.anchor.line),
|
|
|
+ Math.min(sel.head.ch, sel.anchor.ch));
|
|
|
+ height = Math.abs(sel.head.line - sel.anchor.line) + 1;
|
|
|
+ }
|
|
|
+ } else if (insertAt == 'endOfSelectedArea') {
|
|
|
+ if (!vim.visualBlock) {
|
|
|
+ if (sel.head.line >= sel.anchor.line) {
|
|
|
+ head = offsetCursor(sel.head, 0, 1);
|
|
|
+ } else {
|
|
|
+ head = Pos(sel.anchor.line, 0);
|
|
|
}
|
|
|
- editor.selection.selectTo(count, 0);
|
|
|
+ } else {
|
|
|
+ head = Pos(
|
|
|
+ Math.min(sel.head.line, sel.anchor.line),
|
|
|
+ Math.max(sel.head.ch + 1, sel.anchor.ch));
|
|
|
+ height = Math.abs(sel.head.line - sel.anchor.line) + 1;
|
|
|
+ }
|
|
|
+ } else if (insertAt == 'inplace') {
|
|
|
+ if (vim.visualMode){
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "g": {
|
|
|
- param: true,
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- switch(param) {
|
|
|
- case "m":
|
|
|
- console.log("Middle line");
|
|
|
- break;
|
|
|
- case "e":
|
|
|
- console.log("End of prev word");
|
|
|
- break;
|
|
|
- case "g":
|
|
|
- editor.gotoLine(count || 0);
|
|
|
- case "u":
|
|
|
- editor.gotoLine(count || 0);
|
|
|
- case "U":
|
|
|
- editor.gotoLine(count || 0);
|
|
|
+ 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.setOption('keyMap', 'vim-insert');
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
|
|
|
+ }
|
|
|
+ if (!vimGlobalState.macroModeState.isPlaying) {
|
|
|
+ cm.on('change', onChange);
|
|
|
+ CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
|
|
|
+ }
|
|
|
+ if (vim.visualMode) {
|
|
|
+ exitVisualMode(cm);
|
|
|
+ }
|
|
|
+ selectForInsert(cm, head, height);
|
|
|
+ },
|
|
|
+ toggleVisualMode: function(cm, actionArgs, vim) {
|
|
|
+ var repeat = actionArgs.repeat;
|
|
|
+ var anchor = cm.getCursor();
|
|
|
+ var head;
|
|
|
+ if (!vim.visualMode) {
|
|
|
+ vim.visualMode = true;
|
|
|
+ vim.visualLine = !!actionArgs.linewise;
|
|
|
+ vim.visualBlock = !!actionArgs.blockwise;
|
|
|
+ head = clipCursorToContent(
|
|
|
+ cm, Pos(anchor.line, anchor.ch + repeat - 1),
|
|
|
+ true /** includeLineBreak */);
|
|
|
+ vim.sel = {
|
|
|
+ anchor: anchor,
|
|
|
+ head: head
|
|
|
+ };
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
|
|
|
+ updateCmSelection(cm);
|
|
|
+ updateMark(cm, vim, '<', cursorMin(anchor, head));
|
|
|
+ updateMark(cm, vim, '>', cursorMax(anchor, head));
|
|
|
+ } else if (vim.visualLine ^ actionArgs.linewise ||
|
|
|
+ vim.visualBlock ^ actionArgs.blockwise) {
|
|
|
+ vim.visualLine = !!actionArgs.linewise;
|
|
|
+ vim.visualBlock = !!actionArgs.blockwise;
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
|
|
|
+ updateCmSelection(cm);
|
|
|
+ } else {
|
|
|
+ exitVisualMode(cm);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ reselectLastSelection: function(cm, _actionArgs, vim) {
|
|
|
+ var lastSelection = vim.lastSelection;
|
|
|
+ if (vim.visualMode) {
|
|
|
+ updateLastSelection(cm, vim);
|
|
|
+ }
|
|
|
+ if (lastSelection) {
|
|
|
+ var anchor = lastSelection.anchorMark.find();
|
|
|
+ var head = lastSelection.headMark.find();
|
|
|
+ if (!anchor || !head) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ vim.sel = {
|
|
|
+ anchor: anchor,
|
|
|
+ head: head
|
|
|
+ };
|
|
|
+ vim.visualMode = true;
|
|
|
+ vim.visualLine = lastSelection.visualLine;
|
|
|
+ vim.visualBlock = lastSelection.visualBlock;
|
|
|
+ updateCmSelection(cm);
|
|
|
+ updateMark(cm, vim, '<', cursorMin(anchor, head));
|
|
|
+ updateMark(cm, vim, '>', cursorMax(anchor, head));
|
|
|
+ CodeMirror.signal(cm, 'vim-mode-change', {
|
|
|
+ mode: 'visual',
|
|
|
+ subMode: vim.visualLine ? 'linewise' :
|
|
|
+ vim.visualBlock ? 'blockwise' : ''});
|
|
|
+ }
|
|
|
+ },
|
|
|
+ joinLines: function(cm, actionArgs, vim) {
|
|
|
+ var curStart, curEnd;
|
|
|
+ if (vim.visualMode) {
|
|
|
+ curStart = cm.getCursor('anchor');
|
|
|
+ curEnd = cm.getCursor('head');
|
|
|
+ curEnd.ch = lineLength(cm, curEnd.line) - 1;
|
|
|
+ } else {
|
|
|
+ var repeat = Math.max(actionArgs.repeat, 2);
|
|
|
+ curStart = cm.getCursor();
|
|
|
+ curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
|
|
|
+ Infinity));
|
|
|
+ }
|
|
|
+ var finalCh = 0;
|
|
|
+ for (var i = curStart.line; i < curEnd.line; i++) {
|
|
|
+ finalCh = lineLength(cm, curStart.line);
|
|
|
+ var tmp = Pos(curStart.line + 1,
|
|
|
+ lineLength(cm, curStart.line + 1));
|
|
|
+ var text = cm.getRange(curStart, tmp);
|
|
|
+ text = text.replace(/\n\s*/g, ' ');
|
|
|
+ cm.replaceRange(text, curStart, tmp);
|
|
|
+ }
|
|
|
+ var curFinalPos = Pos(curStart.line, finalCh);
|
|
|
+ cm.setCursor(curFinalPos);
|
|
|
+ if (vim.visualMode) {
|
|
|
+ exitVisualMode(cm);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
|
|
|
+ vim.insertMode = true;
|
|
|
+ var insertAt = copyCursor(cm.getCursor());
|
|
|
+ if (insertAt.line === cm.firstLine() && !actionArgs.after) {
|
|
|
+ cm.replaceRange('\n', Pos(cm.firstLine(), 0));
|
|
|
+ cm.setCursor(cm.firstLine(), 0);
|
|
|
+ } else {
|
|
|
+ insertAt.line = (actionArgs.after) ? insertAt.line :
|
|
|
+ insertAt.line - 1;
|
|
|
+ insertAt.ch = lineLength(cm, insertAt.line);
|
|
|
+ cm.setCursor(insertAt);
|
|
|
+ var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
|
|
|
+ CodeMirror.commands.newlineAndIndent;
|
|
|
+ newlineFn(cm);
|
|
|
+ }
|
|
|
+ this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
|
|
|
+ },
|
|
|
+ paste: function(cm, actionArgs, vim) {
|
|
|
+ var cur = copyCursor(cm.getCursor());
|
|
|
+ var register = vimGlobalState.registerController.getRegister(
|
|
|
+ actionArgs.registerName);
|
|
|
+ var text = register.toString();
|
|
|
+ if (!text) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (actionArgs.matchIndent) {
|
|
|
+ var tabSize = cm.getOption("tabSize");
|
|
|
+ var whitespaceLength = function(str) {
|
|
|
+ var tabs = (str.split("\t").length - 1);
|
|
|
+ var spaces = (str.split(" ").length - 1);
|
|
|
+ return tabs * tabSize + spaces * 1;
|
|
|
+ };
|
|
|
+ var currentLine = cm.getLine(cm.getCursor().line);
|
|
|
+ var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
|
|
|
+ var chompedText = text.replace(/\n$/, '');
|
|
|
+ var wasChomped = text !== chompedText;
|
|
|
+ var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
|
|
|
+ var text = chompedText.replace(/^\s*/gm, function(wspace) {
|
|
|
+ var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
|
|
|
+ if (newIndent < 0) {
|
|
|
+ return "";
|
|
|
}
|
|
|
- },
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- switch(param) {
|
|
|
- case "m":
|
|
|
- console.log("Middle line");
|
|
|
- break;
|
|
|
- case "e":
|
|
|
- console.log("End of prev word");
|
|
|
- break;
|
|
|
- case "g":
|
|
|
- editor.selection.selectTo(count || 0, 0);
|
|
|
+ else if (cm.getOption("indentWithTabs")) {
|
|
|
+ var quotient = Math.floor(newIndent / tabSize);
|
|
|
+ return Array(quotient + 1).join('\t');
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ return Array(newIndent + 1).join(' ');
|
|
|
}
|
|
|
+ });
|
|
|
+ text += wasChomped ? "\n" : "";
|
|
|
}
|
|
|
- },
|
|
|
- "o": {
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- var content = "";
|
|
|
- while (0 < count--)
|
|
|
- content += "\n";
|
|
|
-
|
|
|
- if (content.length) {
|
|
|
- editor.navigateLineEnd()
|
|
|
- editor.insert(content);
|
|
|
- util.insertMode(editor);
|
|
|
+ if (actionArgs.repeat > 1) {
|
|
|
+ var text = Array(actionArgs.repeat + 1).join(text);
|
|
|
+ }
|
|
|
+ var linewise = register.linewise;
|
|
|
+ var blockwise = register.blockwise;
|
|
|
+ if (linewise) {
|
|
|
+ if(vim.visualMode) {
|
|
|
+ text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
|
|
|
+ } else if (actionArgs.after) {
|
|
|
+ text = '\n' + text.slice(0, text.length - 1);
|
|
|
+ cur.ch = lineLength(cm, cur.line);
|
|
|
+ } else {
|
|
|
+ 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;
|
|
|
}
|
|
|
- },
|
|
|
- "O": {
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- var row = editor.getCursorPosition().row;
|
|
|
- count = count || 1;
|
|
|
- var content = "";
|
|
|
- while (0 < count--)
|
|
|
- content += "\n";
|
|
|
-
|
|
|
- if (content.length) {
|
|
|
- if(row > 0) {
|
|
|
- editor.navigateUp();
|
|
|
- editor.navigateLineEnd()
|
|
|
- editor.insert(content);
|
|
|
- } else {
|
|
|
- editor.session.insert({row: 0, column: 0}, content);
|
|
|
- editor.navigateUp();
|
|
|
- }
|
|
|
- util.insertMode(editor);
|
|
|
+ var curPosFinal;
|
|
|
+ var idx;
|
|
|
+ if (vim.visualMode) {
|
|
|
+ vim.lastPastedText = text;
|
|
|
+ var lastSelectionCurEnd;
|
|
|
+ var selectedArea = getSelectedAreaRange(cm, vim);
|
|
|
+ var selectionStart = selectedArea[0];
|
|
|
+ var selectionEnd = selectedArea[1];
|
|
|
+ var selectedText = cm.getSelection();
|
|
|
+ var selections = cm.listSelections();
|
|
|
+ var emptyStrings = new Array(selections.length).join('1').split('1');
|
|
|
+ if (vim.lastSelection) {
|
|
|
+ lastSelectionCurEnd = vim.lastSelection.headMark.find();
|
|
|
+ }
|
|
|
+ vimGlobalState.registerController.unnamedRegister.setText(selectedText);
|
|
|
+ if (blockwise) {
|
|
|
+ cm.replaceSelections(emptyStrings);
|
|
|
+ selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
|
|
|
+ cm.setCursor(selectionStart);
|
|
|
+ selectBlock(cm, selectionEnd);
|
|
|
+ cm.replaceSelections(text);
|
|
|
+ curPosFinal = selectionStart;
|
|
|
+ } else if (vim.visualBlock) {
|
|
|
+ cm.replaceSelections(emptyStrings);
|
|
|
+ cm.setCursor(selectionStart);
|
|
|
+ cm.replaceRange(text, selectionStart, selectionStart);
|
|
|
+ curPosFinal = selectionStart;
|
|
|
+ } else {
|
|
|
+ cm.replaceRange(text, selectionStart, selectionEnd);
|
|
|
+ curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
|
|
|
+ }
|
|
|
+ if(lastSelectionCurEnd) {
|
|
|
+ vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
|
|
|
+ }
|
|
|
+ if (linewise) {
|
|
|
+ curPosFinal.ch=0;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (blockwise) {
|
|
|
+ cm.setCursor(cur);
|
|
|
+ for (var i = 0; i < text.length; i++) {
|
|
|
+ var line = cur.line+i;
|
|
|
+ if (line > cm.lastLine()) {
|
|
|
+ cm.replaceRange('\n', Pos(line, 0));
|
|
|
+ }
|
|
|
+ var lastCh = lineLength(cm, line);
|
|
|
+ if (lastCh < cur.ch) {
|
|
|
+ extendLineToColumn(cm, line, cur.ch);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ cm.setCursor(cur);
|
|
|
+ selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
|
|
|
+ cm.replaceSelections(text);
|
|
|
+ curPosFinal = cur;
|
|
|
+ } else {
|
|
|
+ cm.replaceRange(text, cur);
|
|
|
+ if (linewise && actionArgs.after) {
|
|
|
+ curPosFinal = Pos(
|
|
|
+ cur.line + 1,
|
|
|
+ findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
|
|
|
+ } else if (linewise && !actionArgs.after) {
|
|
|
+ curPosFinal = Pos(
|
|
|
+ cur.line,
|
|
|
+ findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
|
|
|
+ } else if (!linewise && actionArgs.after) {
|
|
|
+ idx = cm.indexFromPos(cur);
|
|
|
+ curPosFinal = cm.posFromIndex(idx + text.length - 1);
|
|
|
+ } else {
|
|
|
+ idx = cm.indexFromPos(cur);
|
|
|
+ curPosFinal = cm.posFromIndex(idx + text.length);
|
|
|
}
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "%": new Motion(function(editor){
|
|
|
- var brRe = /[\[\]{}()]/g;
|
|
|
- var cursor = editor.getCursorPosition();
|
|
|
- var ch = editor.session.getLine(cursor.row)[cursor.column];
|
|
|
- if (!brRe.test(ch)) {
|
|
|
- var range = find(editor, brRe);
|
|
|
- if (!range)
|
|
|
- return;
|
|
|
- cursor = range.start;
|
|
|
+ if (vim.visualMode) {
|
|
|
+ exitVisualMode(cm);
|
|
|
}
|
|
|
- var match = editor.session.findMatchingBracket({
|
|
|
- row: cursor.row,
|
|
|
- column: cursor.column + 1
|
|
|
+ cm.setCursor(curPosFinal);
|
|
|
+ },
|
|
|
+ undo: function(cm, actionArgs) {
|
|
|
+ cm.operation(function() {
|
|
|
+ repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
|
|
|
+ cm.setCursor(cm.getCursor('anchor'));
|
|
|
});
|
|
|
+ },
|
|
|
+ redo: function(cm, actionArgs) {
|
|
|
+ repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
|
|
|
+ },
|
|
|
+ setRegister: function(_cm, actionArgs, vim) {
|
|
|
+ vim.inputState.registerName = actionArgs.selectedCharacter;
|
|
|
+ },
|
|
|
+ setMark: function(cm, actionArgs, vim) {
|
|
|
+ var markName = actionArgs.selectedCharacter;
|
|
|
+ updateMark(cm, vim, markName, cm.getCursor());
|
|
|
+ },
|
|
|
+ replace: function(cm, actionArgs, vim) {
|
|
|
+ var replaceWith = actionArgs.selectedCharacter;
|
|
|
+ var curStart = cm.getCursor();
|
|
|
+ var replaceTo;
|
|
|
+ var curEnd;
|
|
|
+ var selections = cm.listSelections();
|
|
|
+ if (vim.visualMode) {
|
|
|
+ curStart = cm.getCursor('start');
|
|
|
+ curEnd = cm.getCursor('end');
|
|
|
+ } else {
|
|
|
+ var line = cm.getLine(curStart.line);
|
|
|
+ replaceTo = curStart.ch + actionArgs.repeat;
|
|
|
+ if (replaceTo > line.length) {
|
|
|
+ replaceTo=line.length;
|
|
|
+ }
|
|
|
+ curEnd = Pos(curStart.line, replaceTo);
|
|
|
+ }
|
|
|
+ if (replaceWith=='\n') {
|
|
|
+ if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
|
|
|
+ (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
|
|
|
+ } else {
|
|
|
+ var replaceWithStr = cm.getRange(curStart, curEnd);
|
|
|
+ replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
|
|
|
+ if (vim.visualBlock) {
|
|
|
+ var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
|
|
|
+ replaceWithStr = cm.getSelection();
|
|
|
+ replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
|
|
|
+ cm.replaceSelections(replaceWithStr);
|
|
|
+ } else {
|
|
|
+ cm.replaceRange(replaceWithStr, curStart, curEnd);
|
|
|
+ }
|
|
|
+ if (vim.visualMode) {
|
|
|
+ curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
|
|
|
+ selections[0].anchor : selections[0].head;
|
|
|
+ cm.setCursor(curStart);
|
|
|
+ exitVisualMode(cm);
|
|
|
+ } else {
|
|
|
+ cm.setCursor(offsetCursor(curEnd, 0, -1));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ incrementNumberToken: function(cm, actionArgs) {
|
|
|
+ var cur = cm.getCursor();
|
|
|
+ var lineStr = cm.getLine(cur.line);
|
|
|
+ var re = /-?\d+/g;
|
|
|
+ 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;
|
|
|
+ if (cur.ch < end)break;
|
|
|
+ }
|
|
|
+ if (!actionArgs.backtrack && (end <= cur.ch))return;
|
|
|
+ if (token) {
|
|
|
+ var increment = actionArgs.increase ? 1 : -1;
|
|
|
+ var number = parseInt(token) + (increment * actionArgs.repeat);
|
|
|
+ var from = Pos(cur.line, start);
|
|
|
+ var to = Pos(cur.line, end);
|
|
|
+ numberStr = number.toString();
|
|
|
+ cm.replaceRange(numberStr, from, to);
|
|
|
+ } else {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
|
|
|
+ },
|
|
|
+ repeatLastEdit: function(cm, actionArgs, vim) {
|
|
|
+ var lastEditInputState = vim.lastEditInputState;
|
|
|
+ if (!lastEditInputState) { return; }
|
|
|
+ var repeat = actionArgs.repeat;
|
|
|
+ if (repeat && actionArgs.repeatIsExplicit) {
|
|
|
+ vim.lastEditInputState.repeatOverride = repeat;
|
|
|
+ } else {
|
|
|
+ repeat = vim.lastEditInputState.repeatOverride || repeat;
|
|
|
+ }
|
|
|
+ repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
|
|
|
+ },
|
|
|
+ exitInsertMode: exitInsertMode
|
|
|
+ };
|
|
|
+ function clipCursorToContent(cm, cur, includeLineBreak) {
|
|
|
+ var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
|
|
|
+ var maxCh = lineLength(cm, line) - 1;
|
|
|
+ maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
|
|
|
+ var ch = Math.min(Math.max(0, cur.ch), maxCh);
|
|
|
+ return Pos(line, ch);
|
|
|
+ }
|
|
|
+ function copyArgs(args) {
|
|
|
+ var ret = {};
|
|
|
+ for (var prop in args) {
|
|
|
+ if (args.hasOwnProperty(prop)) {
|
|
|
+ ret[prop] = args[prop];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ function offsetCursor(cur, offsetLine, offsetCh) {
|
|
|
+ if (typeof offsetLine === 'object') {
|
|
|
+ offsetCh = offsetLine.ch;
|
|
|
+ offsetLine = offsetLine.line;
|
|
|
+ }
|
|
|
+ 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++) {
|
|
|
+ var command = keyMap[i];
|
|
|
+ if (context == 'insert' && command.context != 'insert' ||
|
|
|
+ command.context && command.context != context ||
|
|
|
+ inputState.operator && command.type == 'action' ||
|
|
|
+ !(match = commandMatch(keys, command.keys))) { continue; }
|
|
|
+ if (match == 'partial') { partial.push(command); }
|
|
|
+ if (match == 'full') { full.push(command); }
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ partial: partial.length && partial,
|
|
|
+ full: full.length && full
|
|
|
+ };
|
|
|
+ }
|
|
|
+ function commandMatch(pressed, mapped) {
|
|
|
+ if (mapped.slice(-11) == '<character>') {
|
|
|
+ var prefixLen = mapped.length - 11;
|
|
|
+ var pressedPrefix = pressed.slice(0, prefixLen);
|
|
|
+ var mappedPrefix = mapped.slice(0, prefixLen);
|
|
|
+ return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
|
|
|
+ mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
|
|
|
+ } else {
|
|
|
+ return pressed == mapped ? 'full' :
|
|
|
+ mapped.indexOf(pressed) == 0 ? 'partial' : false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function lastChar(keys) {
|
|
|
+ var match = /^.*(<[\w\-]+>)$/.exec(keys);
|
|
|
+ var selectedCharacter = match ? match[1] : keys.slice(-1);
|
|
|
+ if (selectedCharacter.length > 1){
|
|
|
+ switch(selectedCharacter){
|
|
|
+ case '<CR>':
|
|
|
+ selectedCharacter='\n';
|
|
|
+ break;
|
|
|
+ case '<Space>':
|
|
|
+ selectedCharacter=' ';
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return selectedCharacter;
|
|
|
+ }
|
|
|
+ function repeatFn(cm, fn, repeat) {
|
|
|
+ return function() {
|
|
|
+ for (var i = 0; i < repeat; i++) {
|
|
|
+ fn(cm);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ }
|
|
|
+ function copyCursor(cur) {
|
|
|
+ return Pos(cur.line, cur.ch);
|
|
|
+ }
|
|
|
+ function cursorEqual(cur1, cur2) {
|
|
|
+ return cur1.ch == cur2.ch && cur1.line == cur2.line;
|
|
|
+ }
|
|
|
+ function cursorIsBefore(cur1, cur2) {
|
|
|
+ if (cur1.line < cur2.line) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ function cursorMin(cur1, cur2) {
|
|
|
+ if (arguments.length > 2) {
|
|
|
+ cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
|
|
|
+ }
|
|
|
+ return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
|
|
|
+ }
|
|
|
+ function cursorMax(cur1, cur2) {
|
|
|
+ if (arguments.length > 2) {
|
|
|
+ cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
|
|
|
+ }
|
|
|
+ return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
|
|
|
+ }
|
|
|
+ function cursorIsBetween(cur1, cur2, cur3) {
|
|
|
+ var cur1before2 = cursorIsBefore(cur1, cur2);
|
|
|
+ var cur2before3 = cursorIsBefore(cur2, cur3);
|
|
|
+ return cur1before2 && cur2before3;
|
|
|
+ }
|
|
|
+ function lineLength(cm, lineNum) {
|
|
|
+ return cm.getLine(lineNum).length;
|
|
|
+ }
|
|
|
+ function reverse(s){
|
|
|
+ return s.split('').reverse().join('');
|
|
|
+ }
|
|
|
+ function trim(s) {
|
|
|
+ if (s.trim) {
|
|
|
+ return s.trim();
|
|
|
+ }
|
|
|
+ return s.replace(/^\s+|\s+$/g, '');
|
|
|
+ }
|
|
|
+ function escapeRegex(s) {
|
|
|
+ return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
|
|
|
+ }
|
|
|
+ function extendLineToColumn(cm, lineNum, column) {
|
|
|
+ var endCh = lineLength(cm, lineNum);
|
|
|
+ var spaces = new Array(column-endCh+1).join(' ');
|
|
|
+ cm.setCursor(Pos(lineNum, endCh));
|
|
|
+ cm.replaceRange(spaces, cm.getCursor());
|
|
|
+ }
|
|
|
+ function selectBlock(cm, selectionEnd) {
|
|
|
+ var selections = [], ranges = cm.listSelections();
|
|
|
+ var head = copyCursor(cm.clipPos(selectionEnd));
|
|
|
+ var isClipped = !cursorEqual(selectionEnd, head);
|
|
|
+ var curHead = cm.getCursor('head');
|
|
|
+ var primIndex = getIndex(ranges, curHead);
|
|
|
+ var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
|
|
|
+ var max = ranges.length - 1;
|
|
|
+ var index = max - primIndex > primIndex ? max : 0;
|
|
|
+ var base = ranges[index].anchor;
|
|
|
|
|
|
- return match;
|
|
|
- }),
|
|
|
- "{": new Motion(function(ed) {
|
|
|
- var session = ed.session;
|
|
|
- var row = session.selection.lead.row;
|
|
|
- while(row > 0 && !/\S/.test(session.getLine(row)))
|
|
|
- row--;
|
|
|
- while(/\S/.test(session.getLine(row)))
|
|
|
- row--;
|
|
|
- return {column: 0, row: row};
|
|
|
- }),
|
|
|
- "}": new Motion(function(ed) {
|
|
|
- var session = ed.session;
|
|
|
- var l = session.getLength();
|
|
|
- var row = session.selection.lead.row;
|
|
|
- while(row < l && !/\S/.test(session.getLine(row)))
|
|
|
- row++;
|
|
|
- while(/\S/.test(session.getLine(row)))
|
|
|
- row++;
|
|
|
- return {column: 0, row: row};
|
|
|
- }),
|
|
|
- "ctrl-d": {
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- editor.selection.clearSelection();
|
|
|
- keepScrollPosition(editor, editor.gotoPageDown);
|
|
|
- },
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- keepScrollPosition(editor, editor.selectPageDown);
|
|
|
+ var firstLine = Math.min(base.line, head.line);
|
|
|
+ var lastLine = Math.max(base.line, head.line);
|
|
|
+ var baseCh = base.ch, headCh = head.ch;
|
|
|
+
|
|
|
+ var dir = ranges[index].head.ch - baseCh;
|
|
|
+ var newDir = headCh - baseCh;
|
|
|
+ if (dir > 0 && newDir <= 0) {
|
|
|
+ baseCh++;
|
|
|
+ if (!isClipped) { headCh--; }
|
|
|
+ } else if (dir < 0 && newDir >= 0) {
|
|
|
+ baseCh--;
|
|
|
+ if (!wasClipped) { headCh++; }
|
|
|
+ } else if (dir < 0 && newDir == -1) {
|
|
|
+ baseCh--;
|
|
|
+ headCh++;
|
|
|
+ }
|
|
|
+ for (var line = firstLine; line <= lastLine; line++) {
|
|
|
+ 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;
|
|
|
+ return base;
|
|
|
+ }
|
|
|
+ function selectForInsert(cm, head, height) {
|
|
|
+ var sel = [];
|
|
|
+ for (var i = 0; i < height; i++) {
|
|
|
+ var lineHead = offsetCursor(head, i, 0);
|
|
|
+ sel.push({anchor: lineHead, head: lineHead});
|
|
|
+ }
|
|
|
+ cm.setSelections(sel, 0);
|
|
|
+ }
|
|
|
+ function getIndex(ranges, cursor, end) {
|
|
|
+ for (var i = 0; i < ranges.length; i++) {
|
|
|
+ var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
|
|
|
+ var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
|
|
|
+ if (atAnchor || atHead) {
|
|
|
+ return i;
|
|
|
}
|
|
|
- },
|
|
|
- "ctrl-u": {
|
|
|
- nav: function(editor, range, count, param) {
|
|
|
- editor.selection.clearSelection();
|
|
|
- keepScrollPosition(editor, editor.gotoPageUp);
|
|
|
- },
|
|
|
- sel: function(editor, range, count, param) {
|
|
|
- keepScrollPosition(editor, editor.selectPageUp);
|
|
|
+ }
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ function getSelectedAreaRange(cm, vim) {
|
|
|
+ var lastSelection = vim.lastSelection;
|
|
|
+ var getCurrentSelectedAreaRange = function() {
|
|
|
+ var selections = cm.listSelections();
|
|
|
+ var start = selections[0];
|
|
|
+ var end = selections[selections.length-1];
|
|
|
+ var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
|
|
|
+ var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
|
|
|
+ return [selectionStart, selectionEnd];
|
|
|
+ };
|
|
|
+ var getLastSelectedAreaRange = function() {
|
|
|
+ var selectionStart = cm.getCursor();
|
|
|
+ var selectionEnd = cm.getCursor();
|
|
|
+ var block = lastSelection.visualBlock;
|
|
|
+ if (block) {
|
|
|
+ var width = block.width;
|
|
|
+ var height = block.height;
|
|
|
+ selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
|
|
|
+ var selections = [];
|
|
|
+ for (var i = selectionStart.line; i < selectionEnd.line; i++) {
|
|
|
+ var anchor = Pos(i, selectionStart.ch);
|
|
|
+ var head = Pos(i, selectionEnd.ch);
|
|
|
+ var range = {anchor: anchor, head: head};
|
|
|
+ selections.push(range);
|
|
|
+ }
|
|
|
+ cm.setSelections(selections);
|
|
|
+ } else {
|
|
|
+ var start = lastSelection.anchorMark.find();
|
|
|
+ var end = lastSelection.headMark.find();
|
|
|
+ var line = end.line - start.line;
|
|
|
+ var ch = end.ch - start.ch;
|
|
|
+ selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
|
|
|
+ if (lastSelection.visualLine) {
|
|
|
+ selectionStart = Pos(selectionStart.line, 0);
|
|
|
+ selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
|
|
|
+ }
|
|
|
+ cm.setSelection(selectionStart, selectionEnd);
|
|
|
}
|
|
|
- },
|
|
|
- "`": new Motion({
|
|
|
- param: true,
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel) {
|
|
|
- var s = editor.session;
|
|
|
- var marker = s.vimMarkers && s.vimMarkers[param];
|
|
|
- if (marker) {
|
|
|
- return marker.getPosition();
|
|
|
- }
|
|
|
+ return [selectionStart, selectionEnd];
|
|
|
+ };
|
|
|
+ if (!vim.visualMode) {
|
|
|
+ return getLastSelectedAreaRange();
|
|
|
+ } else {
|
|
|
+ return getCurrentSelectedAreaRange();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function updateLastSelection(cm, vim) {
|
|
|
+ var anchor = vim.sel.anchor;
|
|
|
+ var head = vim.sel.head;
|
|
|
+ if (vim.lastPastedText) {
|
|
|
+ head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
|
|
|
+ vim.lastPastedText = null;
|
|
|
+ }
|
|
|
+ vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
|
|
|
+ 'headMark': cm.setBookmark(head),
|
|
|
+ 'anchor': copyCursor(anchor),
|
|
|
+ 'head': copyCursor(head),
|
|
|
+ 'visualMode': vim.visualMode,
|
|
|
+ 'visualLine': vim.visualLine,
|
|
|
+ 'visualBlock': vim.visualBlock};
|
|
|
+ }
|
|
|
+ function expandSelection(cm, start, end) {
|
|
|
+ var sel = cm.state.vim.sel;
|
|
|
+ var head = sel.head;
|
|
|
+ var anchor = sel.anchor;
|
|
|
+ var tmp;
|
|
|
+ if (cursorIsBefore(end, start)) {
|
|
|
+ tmp = end;
|
|
|
+ end = start;
|
|
|
+ start = tmp;
|
|
|
+ }
|
|
|
+ if (cursorIsBefore(head, anchor)) {
|
|
|
+ head = cursorMin(start, head);
|
|
|
+ anchor = cursorMax(anchor, end);
|
|
|
+ } else {
|
|
|
+ anchor = cursorMin(start, anchor);
|
|
|
+ head = cursorMax(head, end);
|
|
|
+ head = offsetCursor(head, 0, -1);
|
|
|
+ if (head.ch == -1 && head.line != cm.firstLine()) {
|
|
|
+ head = Pos(head.line - 1, lineLength(cm, head.line - 1));
|
|
|
}
|
|
|
- }),
|
|
|
- "'": new Motion({
|
|
|
- param: true,
|
|
|
- handlesCount: true,
|
|
|
- getPos: function(editor, range, count, param, isSel) {
|
|
|
- var s = editor.session;
|
|
|
- var marker = s.vimMarkers && s.vimMarkers[param];
|
|
|
- if (marker) {
|
|
|
- var pos = marker.getPosition();
|
|
|
- var line = editor.session.getLine(pos.row);
|
|
|
- pos.column = line.search(/\S/);
|
|
|
- if (pos.column == -1)
|
|
|
- pos.column = line.length;
|
|
|
- return pos;
|
|
|
- }
|
|
|
- },
|
|
|
- isLine: true
|
|
|
- })
|
|
|
-};
|
|
|
+ }
|
|
|
+ return [anchor, head];
|
|
|
+ }
|
|
|
+ function updateCmSelection(cm, sel, mode) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ sel = sel || vim.sel;
|
|
|
+ var mode = mode ||
|
|
|
+ vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
|
|
|
+ var cmSel = makeCmSelection(cm, sel, mode);
|
|
|
+ cm.setSelections(cmSel.ranges, cmSel.primary);
|
|
|
+ updateFakeCursor(cm);
|
|
|
+ }
|
|
|
+ function makeCmSelection(cm, sel, mode, exclusive) {
|
|
|
+ var head = copyCursor(sel.head);
|
|
|
+ var anchor = copyCursor(sel.anchor);
|
|
|
+ if (mode == 'char') {
|
|
|
+ var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
|
|
|
+ var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
|
|
|
+ head = offsetCursor(sel.head, 0, headOffset);
|
|
|
+ anchor = offsetCursor(sel.anchor, 0, anchorOffset);
|
|
|
+ return {
|
|
|
+ ranges: [{anchor: anchor, head: head}],
|
|
|
+ primary: 0
|
|
|
+ };
|
|
|
+ } else if (mode == 'line') {
|
|
|
+ if (!cursorIsBefore(sel.head, sel.anchor)) {
|
|
|
+ anchor.ch = 0;
|
|
|
+
|
|
|
+ var lastLine = cm.lastLine();
|
|
|
+ if (head.line > lastLine) {
|
|
|
+ head.line = lastLine;
|
|
|
+ }
|
|
|
+ head.ch = lineLength(cm, head.line);
|
|
|
+ } else {
|
|
|
+ head.ch = 0;
|
|
|
+ anchor.ch = lineLength(cm, anchor.line);
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ ranges: [{anchor: anchor, head: head}],
|
|
|
+ primary: 0
|
|
|
+ };
|
|
|
+ } else if (mode == 'block') {
|
|
|
+ var top = Math.min(anchor.line, head.line),
|
|
|
+ left = Math.min(anchor.ch, head.ch),
|
|
|
+ bottom = Math.max(anchor.line, head.line),
|
|
|
+ right = Math.max(anchor.ch, head.ch) + 1;
|
|
|
+ var height = bottom - top + 1;
|
|
|
+ var primary = head.line == top ? 0 : height - 1;
|
|
|
+ var ranges = [];
|
|
|
+ for (var i = 0; i < height; i++) {
|
|
|
+ ranges.push({
|
|
|
+ anchor: Pos(top + i, left),
|
|
|
+ head: Pos(top + i, right)
|
|
|
+ });
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ ranges: ranges,
|
|
|
+ primary: primary
|
|
|
+ };
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function getHead(cm) {
|
|
|
+ var cur = cm.getCursor('head');
|
|
|
+ if (cm.getSelection().length == 1) {
|
|
|
+ cur = cursorMin(cur, cm.getCursor('anchor'));
|
|
|
+ }
|
|
|
+ return cur;
|
|
|
+ }
|
|
|
+ function exitVisualMode(cm, moveHead) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ if (moveHead !== false) {
|
|
|
+ cm.setCursor(clipCursorToContent(cm, vim.sel.head));
|
|
|
+ }
|
|
|
+ updateLastSelection(cm, vim);
|
|
|
+ vim.visualMode = false;
|
|
|
+ vim.visualLine = false;
|
|
|
+ vim.visualBlock = false;
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
|
|
|
+ if (vim.fakeCursor) {
|
|
|
+ vim.fakeCursor.clear();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function clipToLine(cm, curStart, curEnd) {
|
|
|
+ var selection = cm.getRange(curStart, curEnd);
|
|
|
+ if (/\n\s*$/.test(selection)) {
|
|
|
+ var lines = selection.split('\n');
|
|
|
+ lines.pop();
|
|
|
+ var line;
|
|
|
+ for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
|
|
|
+ curEnd.line--;
|
|
|
+ curEnd.ch = 0;
|
|
|
+ }
|
|
|
+ if (line) {
|
|
|
+ curEnd.line--;
|
|
|
+ curEnd.ch = lineLength(cm, curEnd.line);
|
|
|
+ } else {
|
|
|
+ curEnd.ch = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function expandSelectionToLine(_cm, curStart, curEnd) {
|
|
|
+ curStart.ch = 0;
|
|
|
+ curEnd.ch = 0;
|
|
|
+ curEnd.line++;
|
|
|
+ }
|
|
|
|
|
|
-module.exports.backspace = module.exports.left = module.exports.h;
|
|
|
-module.exports.space = module.exports['return'] = module.exports.right = module.exports.l;
|
|
|
-module.exports.up = module.exports.k;
|
|
|
-module.exports.down = module.exports.j;
|
|
|
-module.exports.pagedown = module.exports["ctrl-d"];
|
|
|
-module.exports.pageup = module.exports["ctrl-u"];
|
|
|
-module.exports.home = module.exports["0"];
|
|
|
-module.exports.end = module.exports["$"];
|
|
|
+ function findFirstNonWhiteSpaceCharacter(text) {
|
|
|
+ if (!text) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ var firstNonWS = text.search(/\S/);
|
|
|
+ return firstNonWS == -1 ? text.length : firstNonWS;
|
|
|
+ }
|
|
|
|
|
|
-});
|
|
|
+ function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
|
|
|
+ var cur = getHead(cm);
|
|
|
+ var line = cm.getLine(cur.line);
|
|
|
+ var idx = cur.ch;
|
|
|
+ var textAfterIdx = line.substring(idx);
|
|
|
+ var firstMatchedChar;
|
|
|
+ if (noSymbol) {
|
|
|
+ firstMatchedChar = textAfterIdx.search(/\w/);
|
|
|
+ } else {
|
|
|
+ firstMatchedChar = textAfterIdx.search(/\S/);
|
|
|
+ }
|
|
|
+ if (firstMatchedChar == -1) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ idx += firstMatchedChar;
|
|
|
+ textAfterIdx = line.substring(idx);
|
|
|
+ var textBeforeIdx = line.substring(0, idx);
|
|
|
+
|
|
|
+ var matchRegex;
|
|
|
+ if (bigWord) {
|
|
|
+ matchRegex = /^\S+/;
|
|
|
+ } else {
|
|
|
+ if ((/\w/).test(line.charAt(idx))) {
|
|
|
+ matchRegex = /^\w+/;
|
|
|
+ } else {
|
|
|
+ matchRegex = /^[^\w\s]+/;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
-ace.define("ace/keyboard/vim/maps/operators",["require","exports","module","ace/keyboard/vim/maps/util","ace/keyboard/vim/registers","ace/range"], function(require, exports, module) {
|
|
|
+ var wordAfterRegex = matchRegex.exec(textAfterIdx);
|
|
|
+ var wordStart = idx;
|
|
|
+ var wordEnd = idx + wordAfterRegex[0].length;
|
|
|
+ var revTextBeforeIdx = reverse(textBeforeIdx);
|
|
|
+ var wordBeforeRegex = matchRegex.exec(revTextBeforeIdx);
|
|
|
+ if (wordBeforeRegex) {
|
|
|
+ wordStart -= wordBeforeRegex[0].length;
|
|
|
+ }
|
|
|
|
|
|
-"use strict";
|
|
|
+ if (inclusive) {
|
|
|
+ var textAfterWordEnd = line.substring(wordEnd);
|
|
|
+ var whitespacesAfterWord = textAfterWordEnd.match(/^\s*/)[0].length;
|
|
|
+ if (whitespacesAfterWord > 0) {
|
|
|
+ wordEnd += whitespacesAfterWord;
|
|
|
+ } else {
|
|
|
+ var revTrim = revTextBeforeIdx.length - wordStart;
|
|
|
+ var textBeforeWordStart = revTextBeforeIdx.substring(revTrim);
|
|
|
+ var whitespacesBeforeWord = textBeforeWordStart.match(/^\s*/)[0].length;
|
|
|
+ wordStart -= whitespacesBeforeWord;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
-var util = require("./util");
|
|
|
-var registers = require("../registers");
|
|
|
-var Range = require("../../../range").Range;
|
|
|
+ return { start: Pos(cur.line, wordStart),
|
|
|
+ end: Pos(cur.line, wordEnd) };
|
|
|
+ }
|
|
|
|
|
|
-module.exports = {
|
|
|
- "d": {
|
|
|
- selFn: function(editor, range, count, param) {
|
|
|
- registers._default.text = editor.getCopyText();
|
|
|
- registers._default.isLine = util.onVisualLineMode;
|
|
|
- if(util.onVisualLineMode)
|
|
|
- editor.removeLines();
|
|
|
- else
|
|
|
- editor.session.remove(range);
|
|
|
- util.normalMode(editor);
|
|
|
- },
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- switch (param) {
|
|
|
- case "d":
|
|
|
- registers._default.text = "";
|
|
|
- registers._default.isLine = true;
|
|
|
- for (var i = 0; i < count; i++) {
|
|
|
- editor.selection.selectLine();
|
|
|
- registers._default.text += editor.getCopyText();
|
|
|
- var selRange = editor.getSelectionRange();
|
|
|
- if (!selRange.isMultiLine()) {
|
|
|
- var row = selRange.start.row - 1;
|
|
|
- var col = editor.session.getLine(row).length
|
|
|
- selRange.setStart(row, col);
|
|
|
- editor.session.remove(selRange);
|
|
|
- editor.selection.clearSelection();
|
|
|
- break;
|
|
|
- }
|
|
|
- editor.session.remove(selRange);
|
|
|
- editor.selection.clearSelection();
|
|
|
- }
|
|
|
- registers._default.text = registers._default.text.replace(/\n$/, "");
|
|
|
- break;
|
|
|
- default:
|
|
|
- if (range) {
|
|
|
- editor.selection.setSelectionRange(range);
|
|
|
- registers._default.text = editor.getCopyText();
|
|
|
- registers._default.isLine = false;
|
|
|
- editor.session.remove(range);
|
|
|
- editor.selection.clearSelection();
|
|
|
- }
|
|
|
- }
|
|
|
+ function recordJumpPosition(cm, oldCur, newCur) {
|
|
|
+ if (!cursorEqual(oldCur, newCur)) {
|
|
|
+ vimGlobalState.jumpList.add(cm, oldCur, newCur);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ function recordLastCharacterSearch(increment, args) {
|
|
|
+ vimGlobalState.lastChararacterSearch.increment = increment;
|
|
|
+ vimGlobalState.lastChararacterSearch.forward = args.forward;
|
|
|
+ vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
|
|
|
+ }
|
|
|
+
|
|
|
+ var symbolToMode = {
|
|
|
+ '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
|
|
|
+ '[': 'section', ']': 'section',
|
|
|
+ '*': 'comment', '/': 'comment',
|
|
|
+ 'm': 'method', 'M': 'method',
|
|
|
+ '#': 'preprocess'
|
|
|
+ };
|
|
|
+ var findSymbolModes = {
|
|
|
+ bracket: {
|
|
|
+ isComplete: function(state) {
|
|
|
+ if (state.nextCh === state.symb) {
|
|
|
+ state.depth++;
|
|
|
+ if (state.depth >= 1)return true;
|
|
|
+ } else if (state.nextCh === state.reverseSymb) {
|
|
|
+ state.depth--;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
}
|
|
|
- },
|
|
|
- "c": {
|
|
|
- selFn: function(editor, range, count, param) {
|
|
|
- editor.session.remove(range);
|
|
|
- util.insertMode(editor);
|
|
|
+ },
|
|
|
+ section: {
|
|
|
+ init: function(state) {
|
|
|
+ state.curMoveThrough = true;
|
|
|
+ state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
|
|
|
},
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- switch (param) {
|
|
|
- case "c":
|
|
|
- editor.$blockScrolling++;
|
|
|
- editor.selection.$moveSelection(function() {
|
|
|
- editor.selection.moveCursorBy(count - 1, 0);
|
|
|
- });
|
|
|
- var rows = editor.$getSelectedRows();
|
|
|
- range = new Range(rows.first, 0, rows.last, Infinity);
|
|
|
- editor.session.remove(range);
|
|
|
- editor.$blockScrolling--;
|
|
|
- util.insertMode(editor);
|
|
|
- break;
|
|
|
- default:
|
|
|
- if (range) {
|
|
|
- editor.session.remove(range);
|
|
|
- util.insertMode(editor);
|
|
|
- }
|
|
|
- }
|
|
|
+ isComplete: function(state) {
|
|
|
+ return state.index === 0 && state.nextCh === state.symb;
|
|
|
}
|
|
|
- },
|
|
|
- "y": {
|
|
|
- selFn: function(editor, range, count, param) {
|
|
|
- registers._default.text = editor.getCopyText();
|
|
|
- registers._default.isLine = util.onVisualLineMode;
|
|
|
- editor.selection.clearSelection();
|
|
|
- util.normalMode(editor);
|
|
|
- },
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- if (param && param.isLine)
|
|
|
- param = "y";
|
|
|
- switch (param) {
|
|
|
- case "y":
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- editor.selection.selectLine();
|
|
|
- for (var i = 0; i < count - 1; i++) {
|
|
|
- editor.selection.moveCursorDown();
|
|
|
- }
|
|
|
- registers._default.text = editor.getCopyText().replace(/\n$/, "");
|
|
|
- editor.selection.clearSelection();
|
|
|
- registers._default.isLine = true;
|
|
|
- editor.moveCursorToPosition(pos);
|
|
|
- break;
|
|
|
- default:
|
|
|
- if (range) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- editor.selection.setSelectionRange(range);
|
|
|
- registers._default.text = editor.getCopyText();
|
|
|
- registers._default.isLine = false;
|
|
|
- editor.selection.clearSelection();
|
|
|
- editor.moveCursorTo(pos.row, pos.column);
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ comment: {
|
|
|
+ isComplete: function(state) {
|
|
|
+ var found = state.lastCh === '*' && state.nextCh === '/';
|
|
|
+ state.lastCh = state.nextCh;
|
|
|
+ return found;
|
|
|
}
|
|
|
- },
|
|
|
- ">": {
|
|
|
- selFn: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- for (var i = 0; i < count; i++) {
|
|
|
- editor.indent();
|
|
|
- }
|
|
|
- util.normalMode(editor);
|
|
|
+ },
|
|
|
+ method: {
|
|
|
+ init: function(state) {
|
|
|
+ state.symb = (state.symb === 'm' ? '{' : '}');
|
|
|
+ state.reverseSymb = state.symb === '{' ? '}' : '{';
|
|
|
},
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = parseInt(count || 1, 10);
|
|
|
- switch (param) {
|
|
|
- case ">":
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- editor.selection.selectLine();
|
|
|
- for (var i = 0; i < count - 1; i++) {
|
|
|
- editor.selection.moveCursorDown();
|
|
|
- }
|
|
|
- editor.indent();
|
|
|
- editor.selection.clearSelection();
|
|
|
- editor.moveCursorToPosition(pos);
|
|
|
- editor.navigateLineEnd();
|
|
|
- editor.navigateLineStart();
|
|
|
- break;
|
|
|
- }
|
|
|
+ isComplete: function(state) {
|
|
|
+ if (state.nextCh === state.symb)return true;
|
|
|
+ return false;
|
|
|
}
|
|
|
- },
|
|
|
- "<": {
|
|
|
- selFn: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- for (var i = 0; i < count; i++) {
|
|
|
- editor.blockOutdent();
|
|
|
- }
|
|
|
- util.normalMode(editor);
|
|
|
+ },
|
|
|
+ preprocess: {
|
|
|
+ init: function(state) {
|
|
|
+ state.index = 0;
|
|
|
},
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = count || 1;
|
|
|
- switch (param) {
|
|
|
- case "<":
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- editor.selection.selectLine();
|
|
|
- for (var i = 0; i < count - 1; i++) {
|
|
|
- editor.selection.moveCursorDown();
|
|
|
- }
|
|
|
- editor.blockOutdent();
|
|
|
- editor.selection.clearSelection();
|
|
|
- editor.moveCursorToPosition(pos);
|
|
|
- editor.navigateLineEnd();
|
|
|
- editor.navigateLineStart();
|
|
|
- break;
|
|
|
+ isComplete: function(state) {
|
|
|
+ if (state.nextCh === '#') {
|
|
|
+ var token = state.lineText.match(/#(\w+)/)[1];
|
|
|
+ if (token === 'endif') {
|
|
|
+ if (state.forward && state.depth === 0) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ state.depth++;
|
|
|
+ } else if (token === 'if') {
|
|
|
+ if (!state.forward && state.depth === 0) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ state.depth--;
|
|
|
}
|
|
|
+ if (token === 'else' && state.depth === 0)return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
}
|
|
|
+ }
|
|
|
+ };
|
|
|
+ function findSymbol(cm, repeat, forward, symb) {
|
|
|
+ var cur = copyCursor(cm.getCursor());
|
|
|
+ var increment = forward ? 1 : -1;
|
|
|
+ var endLine = forward ? cm.lineCount() : -1;
|
|
|
+ var curCh = cur.ch;
|
|
|
+ var line = cur.line;
|
|
|
+ var lineText = cm.getLine(line);
|
|
|
+ var state = {
|
|
|
+ lineText: lineText,
|
|
|
+ nextCh: lineText.charAt(curCh),
|
|
|
+ lastCh: null,
|
|
|
+ index: curCh,
|
|
|
+ symb: symb,
|
|
|
+ reverseSymb: (forward ? { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
|
|
|
+ forward: forward,
|
|
|
+ depth: 0,
|
|
|
+ curMoveThrough: false
|
|
|
+ };
|
|
|
+ var mode = symbolToMode[symb];
|
|
|
+ if (!mode)return cur;
|
|
|
+ var init = findSymbolModes[mode].init;
|
|
|
+ var isComplete = findSymbolModes[mode].isComplete;
|
|
|
+ if (init) { init(state); }
|
|
|
+ while (line !== endLine && repeat) {
|
|
|
+ state.index += increment;
|
|
|
+ state.nextCh = state.lineText.charAt(state.index);
|
|
|
+ if (!state.nextCh) {
|
|
|
+ line += increment;
|
|
|
+ state.lineText = cm.getLine(line) || '';
|
|
|
+ if (increment > 0) {
|
|
|
+ state.index = 0;
|
|
|
+ } else {
|
|
|
+ var lineLen = state.lineText.length;
|
|
|
+ state.index = (lineLen > 0) ? (lineLen-1) : 0;
|
|
|
+ }
|
|
|
+ state.nextCh = state.lineText.charAt(state.index);
|
|
|
+ }
|
|
|
+ if (isComplete(state)) {
|
|
|
+ cur.line = line;
|
|
|
+ cur.ch = state.index;
|
|
|
+ repeat--;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (state.nextCh || state.curMoveThrough) {
|
|
|
+ return Pos(line, state.index);
|
|
|
+ }
|
|
|
+ return cur;
|
|
|
}
|
|
|
-};
|
|
|
-});
|
|
|
+ function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
|
|
|
+ var lineNum = cur.line;
|
|
|
+ var pos = cur.ch;
|
|
|
+ var line = cm.getLine(lineNum);
|
|
|
+ var dir = forward ? 1 : -1;
|
|
|
+ var regexps = bigWord ? bigWordRegexp : wordRegexp;
|
|
|
|
|
|
-"use strict"
|
|
|
+ if (emptyLineIsWord && line == '') {
|
|
|
+ lineNum += dir;
|
|
|
+ line = cm.getLine(lineNum);
|
|
|
+ if (!isLine(cm, lineNum)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ pos = (forward) ? 0 : line.length;
|
|
|
+ }
|
|
|
|
|
|
-ace.define("ace/keyboard/vim/maps/aliases",["require","exports","module"], function(require, exports, module) {
|
|
|
-module.exports = {
|
|
|
- "x": {
|
|
|
- operator: {
|
|
|
- ch: "d",
|
|
|
- count: 1
|
|
|
- },
|
|
|
- motion: {
|
|
|
- ch: "l",
|
|
|
- count: 1
|
|
|
+ while (true) {
|
|
|
+ if (emptyLineIsWord && line == '') {
|
|
|
+ return { from: 0, to: 0, line: lineNum };
|
|
|
}
|
|
|
- },
|
|
|
- "X": {
|
|
|
- operator: {
|
|
|
- ch: "d",
|
|
|
- count: 1
|
|
|
- },
|
|
|
- motion: {
|
|
|
- ch: "h",
|
|
|
- count: 1
|
|
|
+ var stop = (dir > 0) ? line.length : -1;
|
|
|
+ var wordStart = stop, wordEnd = stop;
|
|
|
+ while (pos != stop) {
|
|
|
+ var foundWord = false;
|
|
|
+ for (var i = 0; i < regexps.length && !foundWord; ++i) {
|
|
|
+ if (regexps[i].test(line.charAt(pos))) {
|
|
|
+ wordStart = pos;
|
|
|
+ while (pos != stop && regexps[i].test(line.charAt(pos))) {
|
|
|
+ pos += dir;
|
|
|
+ }
|
|
|
+ wordEnd = pos;
|
|
|
+ foundWord = wordStart != wordEnd;
|
|
|
+ if (wordStart == cur.ch && lineNum == cur.line &&
|
|
|
+ wordEnd == wordStart + dir) {
|
|
|
+ continue;
|
|
|
+ } else {
|
|
|
+ return {
|
|
|
+ from: Math.min(wordStart, wordEnd + 1),
|
|
|
+ to: Math.max(wordStart, wordEnd),
|
|
|
+ line: lineNum };
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!foundWord) {
|
|
|
+ pos += dir;
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "D": {
|
|
|
- operator: {
|
|
|
- ch: "d",
|
|
|
- count: 1
|
|
|
- },
|
|
|
- motion: {
|
|
|
- ch: "$",
|
|
|
- count: 1
|
|
|
+ lineNum += dir;
|
|
|
+ if (!isLine(cm, lineNum)) {
|
|
|
+ return null;
|
|
|
}
|
|
|
- },
|
|
|
- "C": {
|
|
|
- operator: {
|
|
|
- ch: "c",
|
|
|
- count: 1
|
|
|
- },
|
|
|
- motion: {
|
|
|
- ch: "$",
|
|
|
- count: 1
|
|
|
+ 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);
|
|
|
+ var words = [];
|
|
|
+ if (forward && !wordEnd || !forward && wordEnd) {
|
|
|
+ repeat++;
|
|
|
+ }
|
|
|
+ var emptyLineIsWord = !(forward && wordEnd);
|
|
|
+ for (var i = 0; i < repeat; i++) {
|
|
|
+ var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
|
|
|
+ if (!word) {
|
|
|
+ var eodCh = lineLength(cm, cm.lastLine());
|
|
|
+ words.push(forward
|
|
|
+ ? {line: cm.lastLine(), from: eodCh, to: eodCh}
|
|
|
+ : {line: 0, from: 0, to: 0});
|
|
|
+ break;
|
|
|
}
|
|
|
- },
|
|
|
- "s": {
|
|
|
- operator: {
|
|
|
- ch: "c",
|
|
|
- count: 1
|
|
|
- },
|
|
|
- motion: {
|
|
|
- ch: "l",
|
|
|
- count: 1
|
|
|
+ words.push(word);
|
|
|
+ cur = Pos(word.line, forward ? (word.to - 1) : word.from);
|
|
|
+ }
|
|
|
+ var shortCircuit = words.length != repeat;
|
|
|
+ var firstWord = words[0];
|
|
|
+ var lastWord = words.pop();
|
|
|
+ if (forward && !wordEnd) {
|
|
|
+ if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
|
|
|
+ lastWord = words.pop();
|
|
|
}
|
|
|
- },
|
|
|
- "S": {
|
|
|
- operator: {
|
|
|
- ch: "c",
|
|
|
- count: 1
|
|
|
- },
|
|
|
- param: "c"
|
|
|
+ return Pos(lastWord.line, lastWord.from);
|
|
|
+ } else if (forward && wordEnd) {
|
|
|
+ return Pos(lastWord.line, lastWord.to - 1);
|
|
|
+ } else if (!forward && wordEnd) {
|
|
|
+ if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
|
|
|
+ lastWord = words.pop();
|
|
|
+ }
|
|
|
+ return Pos(lastWord.line, lastWord.to);
|
|
|
+ } else {
|
|
|
+ return Pos(lastWord.line, lastWord.from);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ function moveToCharacter(cm, repeat, forward, character) {
|
|
|
+ var cur = cm.getCursor();
|
|
|
+ var start = cur.ch;
|
|
|
+ var idx;
|
|
|
+ for (var i = 0; i < repeat; i ++) {
|
|
|
+ var line = cm.getLine(cur.line);
|
|
|
+ idx = charIdxInLine(start, line, character, forward, true);
|
|
|
+ if (idx == -1) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ start = idx;
|
|
|
+ }
|
|
|
+ return Pos(cm.getCursor().line, idx);
|
|
|
+ }
|
|
|
+
|
|
|
+ function moveToColumn(cm, repeat) {
|
|
|
+ var line = cm.getCursor().line;
|
|
|
+ return clipCursorToContent(cm, Pos(line, repeat - 1));
|
|
|
}
|
|
|
-};
|
|
|
-});
|
|
|
|
|
|
-ace.define("ace/keyboard/vim/commands",["require","exports","module","ace/lib/lang","ace/keyboard/vim/maps/util","ace/keyboard/vim/maps/motions","ace/keyboard/vim/maps/operators","ace/keyboard/vim/maps/aliases","ace/keyboard/vim/registers"], function(require, exports, module) {
|
|
|
+ function updateMark(cm, vim, markName, pos) {
|
|
|
+ if (!inArray(markName, validMarks)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (vim.marks[markName]) {
|
|
|
+ vim.marks[markName].clear();
|
|
|
+ }
|
|
|
+ vim.marks[markName] = cm.setBookmark(pos);
|
|
|
+ }
|
|
|
|
|
|
-"never use strict";
|
|
|
+ function charIdxInLine(start, line, character, forward, includeChar) {
|
|
|
+ var idx;
|
|
|
+ if (forward) {
|
|
|
+ idx = line.indexOf(character, start + 1);
|
|
|
+ if (idx != -1 && !includeChar) {
|
|
|
+ idx -= 1;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ idx = line.lastIndexOf(character, start - 1);
|
|
|
+ if (idx != -1 && !includeChar) {
|
|
|
+ idx += 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return idx;
|
|
|
+ }
|
|
|
+ function selectCompanionObject(cm, head, symb, inclusive) {
|
|
|
+ var cur = head, start, end;
|
|
|
|
|
|
-var lang = require("../../lib/lang");
|
|
|
-var util = require("./maps/util");
|
|
|
-var motions = require("./maps/motions");
|
|
|
-var operators = require("./maps/operators");
|
|
|
-var alias = require("./maps/aliases");
|
|
|
-var registers = require("./registers");
|
|
|
+ var bracketRegexp = ({
|
|
|
+ '(': /[()]/, ')': /[()]/,
|
|
|
+ '[': /[[\]]/, ']': /[[\]]/,
|
|
|
+ '{': /[{}]/, '}': /[{}]/})[symb];
|
|
|
+ var openSym = ({
|
|
|
+ '(': '(', ')': '(',
|
|
|
+ '[': '[', ']': '[',
|
|
|
+ '{': '{', '}': '{'})[symb];
|
|
|
+ var curChar = cm.getLine(cur.line).charAt(cur.ch);
|
|
|
+ var offset = curChar === openSym ? 1 : 0;
|
|
|
|
|
|
-var NUMBER = 1;
|
|
|
-var OPERATOR = 2;
|
|
|
-var MOTION = 3;
|
|
|
-var ACTION = 4;
|
|
|
-var HMARGIN = 8; // Minimum amount of line separation between margins;
|
|
|
+ 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});
|
|
|
|
|
|
-var repeat = function repeat(fn, count, args) {
|
|
|
- while (0 < count--)
|
|
|
- fn.apply(this, args);
|
|
|
-};
|
|
|
+ if (!start || !end) {
|
|
|
+ return { start: cur, end: cur };
|
|
|
+ }
|
|
|
|
|
|
-var ensureScrollMargin = function(editor) {
|
|
|
- var renderer = editor.renderer;
|
|
|
- var pos = renderer.$cursorLayer.getPixelPosition();
|
|
|
+ start = start.pos;
|
|
|
+ end = end.pos;
|
|
|
|
|
|
- var top = pos.top;
|
|
|
+ if ((start.line == end.line && start.ch > end.ch)
|
|
|
+ || (start.line > end.line)) {
|
|
|
+ var tmp = start;
|
|
|
+ start = end;
|
|
|
+ end = tmp;
|
|
|
+ }
|
|
|
|
|
|
- var margin = HMARGIN * renderer.layerConfig.lineHeight;
|
|
|
- if (2 * margin > renderer.$size.scrollerHeight)
|
|
|
- margin = renderer.$size.scrollerHeight / 2;
|
|
|
+ if (inclusive) {
|
|
|
+ end.ch += 1;
|
|
|
+ } else {
|
|
|
+ start.ch += 1;
|
|
|
+ }
|
|
|
|
|
|
- if (renderer.scrollTop > top - margin) {
|
|
|
- renderer.session.setScrollTop(top - margin);
|
|
|
+ return { start: start, end: end };
|
|
|
}
|
|
|
+ function findBeginningAndEnd(cm, head, symb, inclusive) {
|
|
|
+ var cur = copyCursor(head);
|
|
|
+ var line = cm.getLine(cur.line);
|
|
|
+ var chars = line.split('');
|
|
|
+ var start, end, i, len;
|
|
|
+ var firstIndex = chars.indexOf(symb);
|
|
|
+ if (cur.ch < firstIndex) {
|
|
|
+ cur.ch = firstIndex;
|
|
|
+ }
|
|
|
+ else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
|
|
|
+ end = cur.ch; // assign end to the current cursor
|
|
|
+ --cur.ch; // make sure to look backwards
|
|
|
+ }
|
|
|
+ if (chars[cur.ch] == symb && !end) {
|
|
|
+ start = cur.ch + 1; // assign start to ahead of the cursor
|
|
|
+ } else {
|
|
|
+ for (i = cur.ch; i > -1 && !start; i--) {
|
|
|
+ if (chars[i] == symb) {
|
|
|
+ start = i + 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (start && !end) {
|
|
|
+ for (i = start, len = chars.length; i < len && !end; i++) {
|
|
|
+ if (chars[i] == symb) {
|
|
|
+ end = i;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!start || !end) {
|
|
|
+ return { start: cur, end: cur };
|
|
|
+ }
|
|
|
+ if (inclusive) {
|
|
|
+ --start; ++end;
|
|
|
+ }
|
|
|
|
|
|
- if (renderer.scrollTop + renderer.$size.scrollerHeight < top + margin + renderer.lineHeight) {
|
|
|
- renderer.session.setScrollTop(top + margin + renderer.lineHeight - renderer.$size.scrollerHeight);
|
|
|
+ return {
|
|
|
+ start: Pos(cur.line, start),
|
|
|
+ end: Pos(cur.line, end)
|
|
|
+ };
|
|
|
+ }
|
|
|
+ defineOption('pcre', true, 'boolean');
|
|
|
+ function SearchState() {}
|
|
|
+ SearchState.prototype = {
|
|
|
+ getQuery: function() {
|
|
|
+ return vimGlobalState.query;
|
|
|
+ },
|
|
|
+ setQuery: function(query) {
|
|
|
+ vimGlobalState.query = query;
|
|
|
+ },
|
|
|
+ getOverlay: function() {
|
|
|
+ return this.searchOverlay;
|
|
|
+ },
|
|
|
+ setOverlay: function(overlay) {
|
|
|
+ this.searchOverlay = overlay;
|
|
|
+ },
|
|
|
+ isReversed: function() {
|
|
|
+ return vimGlobalState.isReversed;
|
|
|
+ },
|
|
|
+ setReversed: function(reversed) {
|
|
|
+ vimGlobalState.isReversed = reversed;
|
|
|
+ }
|
|
|
+ };
|
|
|
+ function getSearchState(cm) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ return vim.searchState_ || (vim.searchState_ = new SearchState());
|
|
|
+ }
|
|
|
+ function dialog(cm, template, shortText, onClose, options) {
|
|
|
+ if (cm.openDialog) {
|
|
|
+ cm.openDialog(template, onClose, { bottom: true, value: options.value,
|
|
|
+ onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp });
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ onClose(prompt(shortText, ''));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function splitBySlash(argString) {
|
|
|
+ var slashes = findUnescapedSlashes(argString) || [];
|
|
|
+ if (!slashes.length) return [];
|
|
|
+ var tokens = [];
|
|
|
+ if (slashes[0] !== 0) return;
|
|
|
+ for (var i = 0; i < slashes.length; i++) {
|
|
|
+ if (typeof slashes[i] == 'number')
|
|
|
+ tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
|
|
|
+ }
|
|
|
+ return tokens;
|
|
|
}
|
|
|
-};
|
|
|
|
|
|
-var actions = exports.actions = {
|
|
|
- "z": {
|
|
|
- param: true,
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- switch (param) {
|
|
|
- case "z":
|
|
|
- editor.renderer.alignCursor(null, 0.5);
|
|
|
- break;
|
|
|
- case "t":
|
|
|
- editor.renderer.alignCursor(null, 0);
|
|
|
- break;
|
|
|
- case "b":
|
|
|
- editor.renderer.alignCursor(null, 1);
|
|
|
- break;
|
|
|
- case "c":
|
|
|
- editor.session.onFoldWidgetClick(range.start.row, {domEvent:{target :{}}});
|
|
|
- break;
|
|
|
- case "o":
|
|
|
- editor.session.onFoldWidgetClick(range.start.row, {domEvent:{target :{}}});
|
|
|
- break;
|
|
|
- case "C":
|
|
|
- editor.session.foldAll();
|
|
|
- break;
|
|
|
- case "O":
|
|
|
- editor.session.unfold();
|
|
|
- break;
|
|
|
- }
|
|
|
+ function findUnescapedSlashes(str) {
|
|
|
+ var escapeNextChar = false;
|
|
|
+ var slashes = [];
|
|
|
+ for (var i = 0; i < str.length; i++) {
|
|
|
+ var c = str.charAt(i);
|
|
|
+ if (!escapeNextChar && c == '/') {
|
|
|
+ slashes.push(i);
|
|
|
}
|
|
|
- },
|
|
|
- "r": {
|
|
|
- param: true,
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- if (param && param.length) {
|
|
|
- if (param.length > 1)
|
|
|
- param = param == "return" ? "\n" : param == "tab" ? "\t" : param;
|
|
|
- repeat(function() { editor.insert(param); }, count || 1);
|
|
|
- editor.navigateLeft();
|
|
|
+ escapeNextChar = !escapeNextChar && (c == '\\');
|
|
|
+ }
|
|
|
+ return slashes;
|
|
|
+ }
|
|
|
+ function translateRegex(str) {
|
|
|
+ var specials = '|(){';
|
|
|
+ var unescape = '}';
|
|
|
+ var escapeNextChar = false;
|
|
|
+ var out = [];
|
|
|
+ for (var i = -1; i < str.length; i++) {
|
|
|
+ var c = str.charAt(i) || '';
|
|
|
+ var n = str.charAt(i+1) || '';
|
|
|
+ var specialComesNext = (n && specials.indexOf(n) != -1);
|
|
|
+ if (escapeNextChar) {
|
|
|
+ if (c !== '\\' || !specialComesNext) {
|
|
|
+ out.push(c);
|
|
|
+ }
|
|
|
+ escapeNextChar = false;
|
|
|
+ } else {
|
|
|
+ if (c === '\\') {
|
|
|
+ escapeNextChar = true;
|
|
|
+ if (n && unescape.indexOf(n) != -1) {
|
|
|
+ specialComesNext = true;
|
|
|
+ }
|
|
|
+ if (!specialComesNext || n === '\\') {
|
|
|
+ out.push(c);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ out.push(c);
|
|
|
+ if (specialComesNext && n !== '\\') {
|
|
|
+ out.push('\\');
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "R": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- util.insertMode(editor);
|
|
|
- editor.setOverwrite(true);
|
|
|
+ }
|
|
|
+ return out.join('');
|
|
|
+ }
|
|
|
+ function translateRegexReplace(str) {
|
|
|
+ var escapeNextChar = false;
|
|
|
+ var out = [];
|
|
|
+ for (var i = -1; i < str.length; i++) {
|
|
|
+ var c = str.charAt(i) || '';
|
|
|
+ var n = str.charAt(i+1) || '';
|
|
|
+ if (escapeNextChar) {
|
|
|
+ out.push(c);
|
|
|
+ escapeNextChar = false;
|
|
|
+ } else {
|
|
|
+ if (c === '\\') {
|
|
|
+ escapeNextChar = true;
|
|
|
+ if ((isNumber(n) || n === '$')) {
|
|
|
+ out.push('$');
|
|
|
+ } else if (n !== '/' && n !== '\\') {
|
|
|
+ out.push('\\');
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (c === '$') {
|
|
|
+ out.push('$');
|
|
|
+ }
|
|
|
+ out.push(c);
|
|
|
+ if (n === '/') {
|
|
|
+ out.push('\\');
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "~": {
|
|
|
- fn: function(editor, range, count) {
|
|
|
- repeat(function() {
|
|
|
- var range = editor.selection.getRange();
|
|
|
- if (range.isEmpty())
|
|
|
- range.end.column++;
|
|
|
- var text = editor.session.getTextRange(range);
|
|
|
- var toggled = text.toUpperCase();
|
|
|
- if (toggled != text)
|
|
|
- editor.session.replace(range, toggled);
|
|
|
- else if (text.toLowerCase() != text)
|
|
|
- editor.session.replace(range, text.toLowerCase())
|
|
|
- else
|
|
|
- editor.navigateRight();
|
|
|
- }, count || 1);
|
|
|
+ }
|
|
|
+ return out.join('');
|
|
|
+ }
|
|
|
+ function unescapeRegexReplace(str) {
|
|
|
+ var stream = new CodeMirror.StringStream(str);
|
|
|
+ var output = [];
|
|
|
+ while (!stream.eol()) {
|
|
|
+ while (stream.peek() && stream.peek() != '\\') {
|
|
|
+ output.push(stream.next());
|
|
|
}
|
|
|
- },
|
|
|
- "*": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- editor.selection.selectWord();
|
|
|
- editor.findNext();
|
|
|
- ensureScrollMargin(editor);
|
|
|
- var r = editor.selection.getRange();
|
|
|
- editor.selection.setSelectionRange(r, true);
|
|
|
+ if (stream.match('\\/', true)) {
|
|
|
+ output.push('/');
|
|
|
+ } else if (stream.match('\\\\', true)) {
|
|
|
+ output.push('\\');
|
|
|
+ } else {
|
|
|
+ output.push(stream.next());
|
|
|
}
|
|
|
- },
|
|
|
- "#": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- editor.selection.selectWord();
|
|
|
- editor.findPrevious();
|
|
|
- ensureScrollMargin(editor);
|
|
|
- var r = editor.selection.getRange();
|
|
|
- editor.selection.setSelectionRange(r, true);
|
|
|
+ }
|
|
|
+ return output.join('');
|
|
|
+ }
|
|
|
+ function parseQuery(query, ignoreCase, smartCase) {
|
|
|
+ var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
|
|
|
+ lastSearchRegister.setText(query);
|
|
|
+ if (query instanceof RegExp) { return query; }
|
|
|
+ var slashes = findUnescapedSlashes(query);
|
|
|
+ var regexPart;
|
|
|
+ var forceIgnoreCase;
|
|
|
+ if (!slashes.length) {
|
|
|
+ regexPart = query;
|
|
|
+ } else {
|
|
|
+ regexPart = query.substring(0, slashes[0]);
|
|
|
+ var flagsPart = query.substring(slashes[0]);
|
|
|
+ forceIgnoreCase = (flagsPart.indexOf('i') != -1);
|
|
|
+ }
|
|
|
+ if (!regexPart) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ if (!getOption('pcre')) {
|
|
|
+ regexPart = translateRegex(regexPart);
|
|
|
+ }
|
|
|
+ if (smartCase) {
|
|
|
+ ignoreCase = (/^[^A-Z]*$/).test(regexPart);
|
|
|
+ }
|
|
|
+ var regexp = new RegExp(regexPart,
|
|
|
+ (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
|
|
|
+ return regexp;
|
|
|
+ }
|
|
|
+ function showConfirm(cm, text) {
|
|
|
+ if (cm.openNotification) {
|
|
|
+ cm.openNotification('<span style="color: red">' + text + '</span>',
|
|
|
+ {bottom: true, duration: 5000});
|
|
|
+ } else {
|
|
|
+ alert(text);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function makePrompt(prefix, desc) {
|
|
|
+ var raw = '';
|
|
|
+ if (prefix) {
|
|
|
+ raw += '<span style="font-family: monospace">' + prefix + '</span>';
|
|
|
+ }
|
|
|
+ raw += '<input type="text"/> ' +
|
|
|
+ '<span style="color: #888">';
|
|
|
+ if (desc) {
|
|
|
+ raw += '<span style="color: #888">';
|
|
|
+ raw += desc;
|
|
|
+ raw += '</span>';
|
|
|
+ }
|
|
|
+ return raw;
|
|
|
+ }
|
|
|
+ var searchPromptDesc = '(Javascript regexp)';
|
|
|
+ function showPrompt(cm, options) {
|
|
|
+ var shortText = (options.prefix || '') + ' ' + (options.desc || '');
|
|
|
+ var prompt = makePrompt(options.prefix, options.desc);
|
|
|
+ dialog(cm, prompt, shortText, options.onClose, options);
|
|
|
+ }
|
|
|
+ function regexEqual(r1, r2) {
|
|
|
+ if (r1 instanceof RegExp && r2 instanceof RegExp) {
|
|
|
+ var props = ['global', 'multiline', 'ignoreCase', 'source'];
|
|
|
+ for (var i = 0; i < props.length; i++) {
|
|
|
+ var prop = props[i];
|
|
|
+ if (r1[prop] !== r2[prop]) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
|
|
|
+ if (!rawQuery) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var state = getSearchState(cm);
|
|
|
+ var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
|
|
|
+ if (!query) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ highlightSearchMatches(cm, query);
|
|
|
+ if (regexEqual(query, state.getQuery())) {
|
|
|
+ return query;
|
|
|
+ }
|
|
|
+ state.setQuery(query);
|
|
|
+ return query;
|
|
|
+ }
|
|
|
+ function searchOverlay(query) {
|
|
|
+ if (query.source.charAt(0) == '^') {
|
|
|
+ var matchSol = true;
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ token: function(stream) {
|
|
|
+ if (matchSol && !stream.sol()) {
|
|
|
+ stream.skipToEnd();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var match = stream.match(query, false);
|
|
|
+ if (match) {
|
|
|
+ if (match[0].length == 0) {
|
|
|
+ stream.next();
|
|
|
+ return 'searching';
|
|
|
+ }
|
|
|
+ if (!stream.sol()) {
|
|
|
+ stream.backUp(1);
|
|
|
+ if (!query.exec(stream.next() + match[0])) {
|
|
|
+ stream.next();
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ stream.match(query);
|
|
|
+ return 'searching';
|
|
|
+ }
|
|
|
+ while (!stream.eol()) {
|
|
|
+ stream.next();
|
|
|
+ if (stream.match(query, false)) break;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ query: query
|
|
|
+ };
|
|
|
+ }
|
|
|
+ function highlightSearchMatches(cm, query) {
|
|
|
+ var overlay = getSearchState(cm).getOverlay();
|
|
|
+ if (!overlay || query != overlay.query) {
|
|
|
+ if (overlay) {
|
|
|
+ cm.removeOverlay(overlay);
|
|
|
}
|
|
|
- },
|
|
|
- "m": {
|
|
|
- param: true,
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var s = editor.session;
|
|
|
- var markers = s.vimMarkers || (s.vimMarkers = {});
|
|
|
- var c = editor.getCursorPosition();
|
|
|
- if (!markers[param]) {
|
|
|
- markers[param] = editor.session.doc.createAnchor(c);
|
|
|
+ overlay = searchOverlay(query);
|
|
|
+ cm.addOverlay(overlay);
|
|
|
+ getSearchState(cm).setOverlay(overlay);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function findNext(cm, prev, query, repeat) {
|
|
|
+ if (repeat === undefined) { repeat = 1; }
|
|
|
+ return cm.operation(function() {
|
|
|
+ var pos = cm.getCursor();
|
|
|
+ var cursor = cm.getSearchCursor(query, pos);
|
|
|
+ for (var i = 0; i < repeat; i++) {
|
|
|
+ var found = cursor.find(prev);
|
|
|
+ if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
|
|
|
+ if (!found) {
|
|
|
+ cursor = cm.getSearchCursor(query,
|
|
|
+ (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
|
|
|
+ if (!cursor.find(prev)) {
|
|
|
+ return;
|
|
|
}
|
|
|
- markers[param].setPosition(c.row, c.column, true);
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "n": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var options = editor.getLastSearchOptions();
|
|
|
- options.backwards = false;
|
|
|
- options.start = null;
|
|
|
-
|
|
|
- editor.selection.moveCursorRight();
|
|
|
- editor.selection.clearSelection();
|
|
|
- editor.findNext(options);
|
|
|
-
|
|
|
- ensureScrollMargin(editor);
|
|
|
- var r = editor.selection.getRange();
|
|
|
- r.end.row = r.start.row;
|
|
|
- r.end.column = r.start.column;
|
|
|
- editor.selection.setSelectionRange(r, true);
|
|
|
+ return cursor.from();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ function clearSearchHighlight(cm) {
|
|
|
+ cm.removeOverlay(getSearchState(cm).getOverlay());
|
|
|
+ getSearchState(cm).setOverlay(null);
|
|
|
+ }
|
|
|
+ function isInRange(pos, start, end) {
|
|
|
+ if (typeof pos != 'number') {
|
|
|
+ pos = pos.line;
|
|
|
+ }
|
|
|
+ if (start instanceof Array) {
|
|
|
+ return inArray(pos, start);
|
|
|
+ } else {
|
|
|
+ if (end) {
|
|
|
+ return (pos >= start && pos <= end);
|
|
|
+ } else {
|
|
|
+ return pos == start;
|
|
|
}
|
|
|
- },
|
|
|
- "N": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var options = editor.getLastSearchOptions();
|
|
|
- options.backwards = true;
|
|
|
- options.start = null;
|
|
|
-
|
|
|
- editor.findPrevious(options);
|
|
|
- ensureScrollMargin(editor);
|
|
|
- var r = editor.selection.getRange();
|
|
|
- r.end.row = r.start.row;
|
|
|
- r.end.column = r.start.column;
|
|
|
- editor.selection.setSelectionRange(r, true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function getUserVisibleLines(cm) {
|
|
|
+ var renderer = cm.ace.renderer;
|
|
|
+ return {
|
|
|
+ top: renderer.getFirstFullyVisibleRow(),
|
|
|
+ bottom: renderer.getLastFullyVisibleRow()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var defaultExCommandMap = [
|
|
|
+ { name: 'map' },
|
|
|
+ { name: 'imap', shortName: 'im' },
|
|
|
+ { name: 'nmap', shortName: 'nm' },
|
|
|
+ { name: 'vmap', shortName: 'vm' },
|
|
|
+ { name: 'unmap' },
|
|
|
+ { name: 'write', shortName: 'w' },
|
|
|
+ { name: 'undo', shortName: 'u' },
|
|
|
+ { name: 'redo', shortName: 'red' },
|
|
|
+ { name: 'set', shortName: 'set' },
|
|
|
+ { name: 'sort', shortName: 'sor' },
|
|
|
+ { name: 'substitute', shortName: 's', possiblyAsync: true },
|
|
|
+ { name: 'nohlsearch', shortName: 'noh' },
|
|
|
+ { name: 'delmarks', shortName: 'delm' },
|
|
|
+ { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
|
|
|
+ { name: 'global', shortName: 'g' }
|
|
|
+ ];
|
|
|
+ var ExCommandDispatcher = function() {
|
|
|
+ this.buildCommandMap_();
|
|
|
+ };
|
|
|
+ ExCommandDispatcher.prototype = {
|
|
|
+ processCommand: function(cm, input, opt_params) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
|
|
|
+ var previousCommand = commandHistoryRegister.toString();
|
|
|
+ if (vim.visualMode) {
|
|
|
+ exitVisualMode(cm);
|
|
|
}
|
|
|
- },
|
|
|
- "v": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- editor.selection.selectRight();
|
|
|
- util.visualMode(editor, false);
|
|
|
- },
|
|
|
- acceptsMotion: true
|
|
|
- },
|
|
|
- "V": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var row = editor.getCursorPosition().row;
|
|
|
- editor.selection.moveTo(row, 0);
|
|
|
- editor.selection.selectLineEnd();
|
|
|
- editor.selection.visualLineStart = row;
|
|
|
-
|
|
|
- util.visualMode(editor, true);
|
|
|
- },
|
|
|
- acceptsMotion: true
|
|
|
- },
|
|
|
- "Y": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- util.copyLine(editor);
|
|
|
+ var inputStream = new CodeMirror.StringStream(input);
|
|
|
+ commandHistoryRegister.setText(input);
|
|
|
+ var params = opt_params || {};
|
|
|
+ params.input = input;
|
|
|
+ try {
|
|
|
+ this.parseInput_(cm, inputStream, params);
|
|
|
+ } catch(e) {
|
|
|
+ showConfirm(cm, e);
|
|
|
+ throw e;
|
|
|
}
|
|
|
- },
|
|
|
- "p": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var defaultReg = registers._default;
|
|
|
-
|
|
|
- editor.setOverwrite(false);
|
|
|
- if (defaultReg.isLine) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- pos.column = editor.session.getLine(pos.row).length;
|
|
|
- var text = lang.stringRepeat("\n" + defaultReg.text, count || 1);
|
|
|
- editor.session.insert(pos, text);
|
|
|
- editor.moveCursorTo(pos.row + 1, 0);
|
|
|
+ var command;
|
|
|
+ var commandName;
|
|
|
+ if (!params.commandName) {
|
|
|
+ if (params.line !== undefined) {
|
|
|
+ commandName = 'move';
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ command = this.matchCommand_(params.commandName);
|
|
|
+ if (command) {
|
|
|
+ commandName = command.name;
|
|
|
+ if (command.excludeFromCommandHistory) {
|
|
|
+ commandHistoryRegister.setText(previousCommand);
|
|
|
}
|
|
|
- else {
|
|
|
- editor.navigateRight();
|
|
|
- editor.insert(lang.stringRepeat(defaultReg.text, count || 1));
|
|
|
- editor.navigateLeft();
|
|
|
+ this.parseCommandArgs_(inputStream, params, command);
|
|
|
+ if (command.type == 'exToKey') {
|
|
|
+ for (var i = 0; i < command.toKeys.length; i++) {
|
|
|
+ CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ } else if (command.type == 'exToEx') {
|
|
|
+ this.processCommand(cm, command.toInput);
|
|
|
+ return;
|
|
|
}
|
|
|
- editor.setOverwrite(true);
|
|
|
- editor.selection.clearSelection();
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "P": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var defaultReg = registers._default;
|
|
|
- editor.setOverwrite(false);
|
|
|
-
|
|
|
- if (defaultReg.isLine) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- pos.column = 0;
|
|
|
- var text = lang.stringRepeat(defaultReg.text + "\n", count || 1);
|
|
|
- editor.session.insert(pos, text);
|
|
|
- editor.moveCursorToPosition(pos);
|
|
|
+ if (!commandName) {
|
|
|
+ showConfirm(cm, 'Not an editor command ":' + input + '"');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ try {
|
|
|
+ exCommands[commandName](cm, params);
|
|
|
+ if ((!command || !command.possiblyAsync) && params.callback) {
|
|
|
+ params.callback();
|
|
|
+ }
|
|
|
+ } catch(e) {
|
|
|
+ showConfirm(cm, e);
|
|
|
+ throw e;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ parseInput_: function(cm, inputStream, result) {
|
|
|
+ inputStream.eatWhile(':');
|
|
|
+ if (inputStream.eat('%')) {
|
|
|
+ result.line = cm.firstLine();
|
|
|
+ result.lineEnd = cm.lastLine();
|
|
|
+ } else {
|
|
|
+ result.line = this.parseLineSpec_(cm, inputStream);
|
|
|
+ if (result.line !== undefined && inputStream.eat(',')) {
|
|
|
+ result.lineEnd = this.parseLineSpec_(cm, inputStream);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var commandMatch = inputStream.match(/^(\w+)/);
|
|
|
+ if (commandMatch) {
|
|
|
+ result.commandName = commandMatch[1];
|
|
|
+ } else {
|
|
|
+ result.commandName = inputStream.match(/.*/)[0];
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
+ },
|
|
|
+ parseLineSpec_: function(cm, inputStream) {
|
|
|
+ var numberMatch = inputStream.match(/^(\d+)/);
|
|
|
+ if (numberMatch) {
|
|
|
+ return parseInt(numberMatch[1], 10) - 1;
|
|
|
+ }
|
|
|
+ switch (inputStream.next()) {
|
|
|
+ case '.':
|
|
|
+ return cm.getCursor().line;
|
|
|
+ case '$':
|
|
|
+ return cm.lastLine();
|
|
|
+ case '\'':
|
|
|
+ var mark = cm.state.vim.marks[inputStream.next()];
|
|
|
+ if (mark && mark.find()) {
|
|
|
+ return mark.find().line;
|
|
|
}
|
|
|
- else {
|
|
|
- editor.insert(lang.stringRepeat(defaultReg.text, count || 1));
|
|
|
+ throw new Error('Mark not set');
|
|
|
+ default:
|
|
|
+ inputStream.backUp(1);
|
|
|
+ return undefined;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ parseCommandArgs_: function(inputStream, params, command) {
|
|
|
+ if (inputStream.eol()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ params.argString = inputStream.match(/.*/)[0];
|
|
|
+ var delim = command.argDelimiter || /\s+/;
|
|
|
+ var args = trim(params.argString).split(delim);
|
|
|
+ if (args.length && args[0]) {
|
|
|
+ params.args = args;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ matchCommand_: function(commandName) {
|
|
|
+ for (var i = commandName.length; i > 0; i--) {
|
|
|
+ var prefix = commandName.substring(0, i);
|
|
|
+ if (this.commandMap_[prefix]) {
|
|
|
+ var command = this.commandMap_[prefix];
|
|
|
+ if (command.name.indexOf(commandName) === 0) {
|
|
|
+ return command;
|
|
|
}
|
|
|
- editor.setOverwrite(true);
|
|
|
- editor.selection.clearSelection();
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "J": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var session = editor.session;
|
|
|
- range = editor.getSelectionRange();
|
|
|
- var pos = {row: range.start.row, column: range.start.column};
|
|
|
- count = count || range.end.row - range.start.row;
|
|
|
- var maxRow = Math.min(pos.row + (count || 1), session.getLength() - 1);
|
|
|
-
|
|
|
- range.start.column = session.getLine(pos.row).length;
|
|
|
- range.end.column = session.getLine(maxRow).length;
|
|
|
- range.end.row = maxRow;
|
|
|
-
|
|
|
- var text = "";
|
|
|
- for (var i = pos.row; i < maxRow; i++) {
|
|
|
- var nextLine = session.getLine(i + 1);
|
|
|
- text += " " + /^\s*(.*)$/.exec(nextLine)[1] || "";
|
|
|
+ return null;
|
|
|
+ },
|
|
|
+ buildCommandMap_: function() {
|
|
|
+ this.commandMap_ = {};
|
|
|
+ for (var i = 0; i < defaultExCommandMap.length; i++) {
|
|
|
+ var command = defaultExCommandMap[i];
|
|
|
+ var key = command.shortName || command.name;
|
|
|
+ this.commandMap_[key] = command;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ map: function(lhs, rhs, ctx) {
|
|
|
+ if (lhs != ':' && lhs.charAt(0) == ':') {
|
|
|
+ if (ctx) { throw Error('Mode not supported for ex mappings'); }
|
|
|
+ var commandName = lhs.substring(1);
|
|
|
+ if (rhs != ':' && rhs.charAt(0) == ':') {
|
|
|
+ this.commandMap_[commandName] = {
|
|
|
+ name: commandName,
|
|
|
+ type: 'exToEx',
|
|
|
+ toInput: rhs.substring(1),
|
|
|
+ user: true
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ this.commandMap_[commandName] = {
|
|
|
+ name: commandName,
|
|
|
+ type: 'exToKey',
|
|
|
+ toKeys: rhs,
|
|
|
+ user: true
|
|
|
+ };
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (rhs != ':' && rhs.charAt(0) == ':') {
|
|
|
+ var mapping = {
|
|
|
+ keys: lhs,
|
|
|
+ type: 'keyToEx',
|
|
|
+ exArgs: { input: rhs.substring(1) },
|
|
|
+ user: true};
|
|
|
+ if (ctx) { mapping.context = ctx; }
|
|
|
+ defaultKeymap.unshift(mapping);
|
|
|
+ } else {
|
|
|
+ var mapping = {
|
|
|
+ keys: lhs,
|
|
|
+ type: 'keyToKey',
|
|
|
+ toKeys: rhs,
|
|
|
+ user: true
|
|
|
+ };
|
|
|
+ if (ctx) { mapping.context = ctx; }
|
|
|
+ defaultKeymap.unshift(mapping);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ unmap: function(lhs, ctx) {
|
|
|
+ if (lhs != ':' && lhs.charAt(0) == ':') {
|
|
|
+ if (ctx) { throw Error('Mode not supported for ex mappings'); }
|
|
|
+ var commandName = lhs.substring(1);
|
|
|
+ if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
|
|
|
+ delete this.commandMap_[commandName];
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ var keys = lhs;
|
|
|
+ for (var i = 0; i < defaultKeymap.length; i++) {
|
|
|
+ if (keys == defaultKeymap[i].keys
|
|
|
+ && defaultKeymap[i].context === ctx
|
|
|
+ && defaultKeymap[i].user) {
|
|
|
+ defaultKeymap.splice(i, 1);
|
|
|
+ return;
|
|
|
}
|
|
|
+ }
|
|
|
+ }
|
|
|
+ throw Error('No such mapping.');
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
- session.replace(range, text);
|
|
|
- editor.moveCursorTo(pos.row, pos.column);
|
|
|
+ var exCommands = {
|
|
|
+ map: function(cm, params, ctx) {
|
|
|
+ var mapArgs = params.args;
|
|
|
+ if (!mapArgs || mapArgs.length < 2) {
|
|
|
+ if (cm) {
|
|
|
+ showConfirm(cm, 'Invalid mapping: ' + params.input);
|
|
|
+ }
|
|
|
+ return;
|
|
|
}
|
|
|
- },
|
|
|
- "u": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = parseInt(count || 1, 10);
|
|
|
- for (var i = 0; i < count; i++) {
|
|
|
- editor.undo();
|
|
|
+ exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
|
|
|
+ },
|
|
|
+ imap: function(cm, params) { this.map(cm, params, 'insert'); },
|
|
|
+ nmap: function(cm, params) { this.map(cm, params, 'normal'); },
|
|
|
+ vmap: function(cm, params) { this.map(cm, params, 'visual'); },
|
|
|
+ unmap: function(cm, params, ctx) {
|
|
|
+ var mapArgs = params.args;
|
|
|
+ if (!mapArgs || mapArgs.length < 1) {
|
|
|
+ if (cm) {
|
|
|
+ showConfirm(cm, 'No such mapping: ' + params.input);
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ exCommandDispatcher.unmap(mapArgs[0], ctx);
|
|
|
+ },
|
|
|
+ move: function(cm, params) {
|
|
|
+ commandDispatcher.processCommand(cm, cm.state.vim, {
|
|
|
+ type: 'motion',
|
|
|
+ motion: 'moveToLineOrEdgeOfDocument',
|
|
|
+ motionArgs: { forward: false, explicitRepeat: true,
|
|
|
+ linewise: true },
|
|
|
+ repeatOverride: params.line+1});
|
|
|
+ },
|
|
|
+ set: function(cm, params) {
|
|
|
+ var setArgs = params.args;
|
|
|
+ if (!setArgs || setArgs.length < 1) {
|
|
|
+ if (cm) {
|
|
|
+ showConfirm(cm, 'Invalid mapping: ' + params.input);
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var expr = setArgs[0].split('=');
|
|
|
+ var optionName = expr[0];
|
|
|
+ var value = expr[1];
|
|
|
+ var forceGet = false;
|
|
|
+
|
|
|
+ if (optionName.charAt(optionName.length - 1) == '?') {
|
|
|
+ if (value) { throw Error('Trailing characters: ' + params.argString); }
|
|
|
+ optionName = optionName.substring(0, optionName.length - 1);
|
|
|
+ forceGet = true;
|
|
|
+ }
|
|
|
+ if (value === undefined && optionName.substring(0, 2) == 'no') {
|
|
|
+ optionName = optionName.substring(2);
|
|
|
+ value = false;
|
|
|
+ }
|
|
|
+ var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
|
|
|
+ if (optionIsBoolean && value == undefined) {
|
|
|
+ value = true;
|
|
|
+ }
|
|
|
+ if (!optionIsBoolean && !value || forceGet) {
|
|
|
+ var oldValue = getOption(optionName);
|
|
|
+ if (oldValue === true || oldValue === false) {
|
|
|
+ showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
|
|
|
+ } else {
|
|
|
+ showConfirm(cm, ' ' + optionName + '=' + oldValue);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ setOption(optionName, value, cm);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ registers: function(cm,params) {
|
|
|
+ var regArgs = params.args;
|
|
|
+ var registers = vimGlobalState.registerController.registers;
|
|
|
+ var regInfo = '----------Registers----------<br><br>';
|
|
|
+ if (!regArgs) {
|
|
|
+ for (var registerName in registers) {
|
|
|
+ var text = registers[registerName].toString();
|
|
|
+ if (text.length) {
|
|
|
+ regInfo += '"' + registerName + ' ' + text + '<br>';
|
|
|
}
|
|
|
- editor.selection.clearSelection();
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ var registerName;
|
|
|
+ regArgs = regArgs.join('');
|
|
|
+ for (var i = 0; i < regArgs.length; i++) {
|
|
|
+ registerName = regArgs.charAt(i);
|
|
|
+ if (!vimGlobalState.registerController.isValidRegister(registerName)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ var register = registers[registerName] || new Register();
|
|
|
+ regInfo += '"' + registerName + ' ' + register.toString() + '<br>';
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "ctrl-r": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- count = parseInt(count || 1, 10);
|
|
|
- for (var i = 0; i < count; i++) {
|
|
|
- editor.redo();
|
|
|
+ showConfirm(cm, regInfo);
|
|
|
+ },
|
|
|
+ sort: function(cm, params) {
|
|
|
+ var reverse, ignoreCase, unique, number;
|
|
|
+ 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;
|
|
|
+ if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
|
|
|
+ number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
|
|
|
}
|
|
|
- editor.selection.clearSelection();
|
|
|
+ if (args.eatSpace() && args.match(/\/.*\//)) { 'patterns not supported'; }
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- ":": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- var val = ":";
|
|
|
- if (count > 1)
|
|
|
- val = ".,.+" + count + val;
|
|
|
- if (editor.showCommandLine)
|
|
|
- editor.showCommandLine(val);
|
|
|
+ var err = parseArgs();
|
|
|
+ if (err) {
|
|
|
+ showConfirm(cm, err + ': ' + params.argString);
|
|
|
+ return;
|
|
|
}
|
|
|
- },
|
|
|
- "/": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- if (editor.showCommandLine)
|
|
|
- editor.showCommandLine("/");
|
|
|
+ var lineStart = params.line || cm.firstLine();
|
|
|
+ var lineEnd = params.lineEnd || params.line || cm.lastLine();
|
|
|
+ if (lineStart == lineEnd) { return; }
|
|
|
+ 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]+)/ :
|
|
|
+ (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) {
|
|
|
+ for (var i = 0; i < text.length; i++) {
|
|
|
+ if (numberRegex.exec(text[i])) {
|
|
|
+ numPart.push(text[i]);
|
|
|
+ } else {
|
|
|
+ textPart.push(text[i]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ textPart = text;
|
|
|
}
|
|
|
- },
|
|
|
- "?": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- if (editor.showCommandLine)
|
|
|
- editor.showCommandLine("?");
|
|
|
+ function compareFn(a, b) {
|
|
|
+ if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
|
|
|
+ if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
|
|
|
+ var anum = number && numberRegex.exec(a);
|
|
|
+ var bnum = number && numberRegex.exec(b);
|
|
|
+ if (!anum) { return a < b ? -1 : 1; }
|
|
|
+ anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
|
|
|
+ bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
|
|
|
+ return anum - bnum;
|
|
|
}
|
|
|
- },
|
|
|
- ".": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- util.onInsertReplaySequence = inputBuffer.lastInsertCommands;
|
|
|
- var previous = inputBuffer.previous;
|
|
|
- if (previous) // If there is a previous action
|
|
|
- inputBuffer.exec(editor, previous.action, previous.param);
|
|
|
+ numPart.sort(compareFn);
|
|
|
+ textPart.sort(compareFn);
|
|
|
+ text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
|
|
|
+ if (unique) { // Remove duplicate lines
|
|
|
+ var textOld = text;
|
|
|
+ var lastLine;
|
|
|
+ text = [];
|
|
|
+ for (var i = 0; i < textOld.length; i++) {
|
|
|
+ if (textOld[i] != lastLine) {
|
|
|
+ text.push(textOld[i]);
|
|
|
+ }
|
|
|
+ lastLine = textOld[i];
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- "ctrl-x": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- editor.modifyNumber(-(count || 1));
|
|
|
+ cm.replaceRange(text.join('\n'), curStart, curEnd);
|
|
|
+ },
|
|
|
+ global: function(cm, params) {
|
|
|
+ var argString = params.argString;
|
|
|
+ if (!argString) {
|
|
|
+ showConfirm(cm, 'Regular Expression missing from global');
|
|
|
+ return;
|
|
|
}
|
|
|
- },
|
|
|
- "ctrl-a": {
|
|
|
- fn: function(editor, range, count, param) {
|
|
|
- editor.modifyNumber(count || 1);
|
|
|
+ var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
|
|
|
+ var lineEnd = params.lineEnd || params.line || cm.lastLine();
|
|
|
+ var tokens = splitBySlash(argString);
|
|
|
+ var regexPart = argString, cmd;
|
|
|
+ if (tokens.length) {
|
|
|
+ regexPart = tokens[0];
|
|
|
+ cmd = tokens.slice(1, tokens.length).join('/');
|
|
|
}
|
|
|
- }
|
|
|
-};
|
|
|
-
|
|
|
-var inputBuffer = exports.inputBuffer = {
|
|
|
- accepting: [NUMBER, OPERATOR, MOTION, ACTION],
|
|
|
- currentCmd: null,
|
|
|
- currentCount: "",
|
|
|
- pendingCount: "",
|
|
|
- status: "",
|
|
|
- operator: null,
|
|
|
- motion: null,
|
|
|
-
|
|
|
- lastInsertCommands: [],
|
|
|
-
|
|
|
- push: function(editor, ch, keyId) {
|
|
|
- var status = this.status;
|
|
|
- var isKeyHandled = true;
|
|
|
- this.idle = false;
|
|
|
- var wObj = this.waitingForParam;
|
|
|
- if (/^numpad\d+$/i.test(ch))
|
|
|
- ch = ch.substr(6);
|
|
|
-
|
|
|
- if (wObj) {
|
|
|
- this.exec(editor, wObj, ch);
|
|
|
- }
|
|
|
- else if (!(ch === "0" && !this.currentCount.length) &&
|
|
|
- (/^\d+$/.test(ch) && this.isAccepting(NUMBER))) {
|
|
|
- this.currentCount += ch;
|
|
|
- this.currentCmd = NUMBER;
|
|
|
- this.accepting = [NUMBER, OPERATOR, MOTION, ACTION];
|
|
|
- }
|
|
|
- else if (!this.operator && this.isAccepting(OPERATOR) && operators[ch]) {
|
|
|
- this.operator = {
|
|
|
- ch: ch,
|
|
|
- count: this.getCount()
|
|
|
- };
|
|
|
- this.currentCmd = OPERATOR;
|
|
|
- this.accepting = [NUMBER, MOTION, ACTION];
|
|
|
- this.exec(editor, { operator: this.operator });
|
|
|
- }
|
|
|
- else if (motions[ch] && this.isAccepting(MOTION)) {
|
|
|
- this.currentCmd = MOTION;
|
|
|
-
|
|
|
- var ctx = {
|
|
|
- operator: this.operator,
|
|
|
- motion: {
|
|
|
- ch: ch,
|
|
|
- count: this.getCount()
|
|
|
- }
|
|
|
- };
|
|
|
-
|
|
|
- if (motions[ch].param)
|
|
|
- this.waitForParam(ctx);
|
|
|
- else
|
|
|
- this.exec(editor, ctx);
|
|
|
+ if (regexPart) {
|
|
|
+ try {
|
|
|
+ updateSearchQuery(cm, regexPart, true /** ignoreCase */,
|
|
|
+ true /** smartCase */);
|
|
|
+ } catch (e) {
|
|
|
+ showConfirm(cm, 'Invalid regex: ' + regexPart);
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- else if (alias[ch] && this.isAccepting(MOTION)) {
|
|
|
- alias[ch].operator.count = this.getCount();
|
|
|
- this.exec(editor, alias[ch]);
|
|
|
+ var query = getSearchState(cm).getQuery();
|
|
|
+ var matchedLines = [], content = '';
|
|
|
+ for (var i = lineStart; i <= lineEnd; i++) {
|
|
|
+ var matched = query.test(cm.getLine(i));
|
|
|
+ if (matched) {
|
|
|
+ matchedLines.push(i+1);
|
|
|
+ content+= cm.getLine(i) + '<br>';
|
|
|
+ }
|
|
|
}
|
|
|
- else if (actions[ch] && this.isAccepting(ACTION)) {
|
|
|
- var actionObj = {
|
|
|
- action: {
|
|
|
- fn: actions[ch].fn,
|
|
|
- count: this.getCount()
|
|
|
- }
|
|
|
- };
|
|
|
-
|
|
|
- if (actions[ch].param) {
|
|
|
- this.waitForParam(actionObj);
|
|
|
+ if (!cmd) {
|
|
|
+ showConfirm(cm, content);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ var index = 0;
|
|
|
+ var nextCommand = function() {
|
|
|
+ if (index < matchedLines.length) {
|
|
|
+ var command = matchedLines[index] + cmd;
|
|
|
+ exCommandDispatcher.processCommand(cm, command, {
|
|
|
+ callback: nextCommand
|
|
|
+ });
|
|
|
+ }
|
|
|
+ index++;
|
|
|
+ };
|
|
|
+ nextCommand();
|
|
|
+ },
|
|
|
+ substitute: function(cm, params) {
|
|
|
+ if (!cm.getSearchCursor) {
|
|
|
+ throw new Error('Search feature not available. Requires searchcursor.js or ' +
|
|
|
+ 'any other getSearchCursor implementation.');
|
|
|
+ }
|
|
|
+ var argString = params.argString;
|
|
|
+ var tokens = argString ? splitBySlash(argString) : [];
|
|
|
+ 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 (replacePart !== undefined) {
|
|
|
+ if (getOption('pcre')) {
|
|
|
+ replacePart = unescapeRegexReplace(replacePart);
|
|
|
+ } else {
|
|
|
+ replacePart = translateRegexReplace(replacePart);
|
|
|
}
|
|
|
- else {
|
|
|
- this.exec(editor, actionObj);
|
|
|
+ vimGlobalState.lastSubstituteReplacePart = replacePart;
|
|
|
+ }
|
|
|
+ trailing = tokens[2] ? tokens[2].split(' ') : [];
|
|
|
+ } else {
|
|
|
+ if (argString && argString.length) {
|
|
|
+ showConfirm(cm, 'Substitutions should be of the form ' +
|
|
|
+ ':s/pattern/replace/');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (trailing) {
|
|
|
+ flagsPart = trailing[0];
|
|
|
+ count = parseInt(trailing[1]);
|
|
|
+ if (flagsPart) {
|
|
|
+ if (flagsPart.indexOf('c') != -1) {
|
|
|
+ confirm = true;
|
|
|
+ flagsPart.replace('c', '');
|
|
|
}
|
|
|
-
|
|
|
- if (actions[ch].acceptsMotion)
|
|
|
- this.idle = false;
|
|
|
+ if (flagsPart.indexOf('g') != -1) {
|
|
|
+ global = true;
|
|
|
+ flagsPart.replace('g', '');
|
|
|
+ }
|
|
|
+ regexPart = regexPart + '/' + flagsPart;
|
|
|
+ }
|
|
|
}
|
|
|
- else if (this.operator) {
|
|
|
- this.operator.count = this.getCount();
|
|
|
- this.exec(editor, { operator: this.operator }, ch);
|
|
|
+ if (regexPart) {
|
|
|
+ try {
|
|
|
+ updateSearchQuery(cm, regexPart, true /** ignoreCase */,
|
|
|
+ true /** smartCase */);
|
|
|
+ } catch (e) {
|
|
|
+ showConfirm(cm, 'Invalid regex: ' + regexPart);
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- else {
|
|
|
- isKeyHandled = ch.length == 1;
|
|
|
- this.reset();
|
|
|
+ replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart;
|
|
|
+ if (replacePart === undefined) {
|
|
|
+ showConfirm(cm, 'No previous substitute regular expression');
|
|
|
+ return;
|
|
|
}
|
|
|
-
|
|
|
- if (this.waitingForParam || this.motion || this.operator) {
|
|
|
- this.status += ch;
|
|
|
- } else if (this.currentCount) {
|
|
|
- this.status = this.currentCount;
|
|
|
- } else if (this.status) {
|
|
|
- this.status = "";
|
|
|
+ var state = getSearchState(cm);
|
|
|
+ var query = state.getQuery();
|
|
|
+ var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
|
|
|
+ var lineEnd = params.lineEnd || lineStart;
|
|
|
+ if (count) {
|
|
|
+ lineStart = lineEnd;
|
|
|
+ lineEnd = lineStart + count - 1;
|
|
|
+ }
|
|
|
+ var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
|
|
|
+ var cursor = cm.getSearchCursor(query, startPos);
|
|
|
+ doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
|
|
|
+ },
|
|
|
+ redo: CodeMirror.commands.redo,
|
|
|
+ undo: CodeMirror.commands.undo,
|
|
|
+ write: function(cm) {
|
|
|
+ if (CodeMirror.commands.save) {
|
|
|
+ CodeMirror.commands.save(cm);
|
|
|
+ } else {
|
|
|
+ cm.save();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ nohlsearch: function(cm) {
|
|
|
+ clearSearchHighlight(cm);
|
|
|
+ },
|
|
|
+ delmarks: function(cm, params) {
|
|
|
+ if (!params.argString || !trim(params.argString)) {
|
|
|
+ showConfirm(cm, 'Argument required');
|
|
|
+ return;
|
|
|
}
|
|
|
- if (this.status != status)
|
|
|
- editor._emit("changeStatus");
|
|
|
- return isKeyHandled;
|
|
|
- },
|
|
|
-
|
|
|
- waitForParam: function(cmd) {
|
|
|
- this.waitingForParam = cmd;
|
|
|
- },
|
|
|
|
|
|
- getCount: function() {
|
|
|
- var count = this.currentCount || this.pendingCount;
|
|
|
- this.currentCount = "";
|
|
|
- this.pendingCount = count;
|
|
|
- return count && parseInt(count, 10);
|
|
|
- },
|
|
|
+ var state = cm.state.vim;
|
|
|
+ var stream = new CodeMirror.StringStream(trim(params.argString));
|
|
|
+ while (!stream.eol()) {
|
|
|
+ stream.eatSpace();
|
|
|
+ var count = stream.pos;
|
|
|
|
|
|
- exec: function(editor, action, param) {
|
|
|
- var m = action.motion;
|
|
|
- var o = action.operator;
|
|
|
- var a = action.action;
|
|
|
+ if (!stream.match(/[a-zA-Z]/, false)) {
|
|
|
+ showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- if (!param)
|
|
|
- param = action.param;
|
|
|
+ var sym = stream.next();
|
|
|
+ if (stream.match('-', true)) {
|
|
|
+ if (!stream.match(/[a-zA-Z]/, false)) {
|
|
|
+ showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- if (o) {
|
|
|
- this.previous = {
|
|
|
- action: action,
|
|
|
- param: param
|
|
|
- };
|
|
|
+ var startMark = sym;
|
|
|
+ var finishMark = stream.next();
|
|
|
+ if (isLowerCase(startMark) && isLowerCase(finishMark) ||
|
|
|
+ isUpperCase(startMark) && isUpperCase(finishMark)) {
|
|
|
+ var start = startMark.charCodeAt(0);
|
|
|
+ var finish = finishMark.charCodeAt(0);
|
|
|
+ if (start >= finish) {
|
|
|
+ showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (var j = 0; j <= finish - start; j++) {
|
|
|
+ var mark = String.fromCharCode(start + j);
|
|
|
+ delete state.marks[mark];
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ showConfirm(cm, 'Invalid argument: ' + startMark + '-');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ delete state.marks[sym];
|
|
|
+ }
|
|
|
}
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
- if (o && !editor.selection.isEmpty()) {
|
|
|
- if (operators[o.ch].selFn) {
|
|
|
- operators[o.ch].selFn(editor, editor.getSelectionRange(), o.count, param);
|
|
|
- this.reset();
|
|
|
- }
|
|
|
- return;
|
|
|
+ var exCommandDispatcher = new ExCommandDispatcher();
|
|
|
+ function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
|
|
|
+ replaceWith, callback) {
|
|
|
+ cm.state.vim.exMode = true;
|
|
|
+ var done = false;
|
|
|
+ var lastPos = searchCursor.from();
|
|
|
+ function replaceAll() {
|
|
|
+ cm.operation(function() {
|
|
|
+ while (!done) {
|
|
|
+ replace();
|
|
|
+ next();
|
|
|
+ }
|
|
|
+ stop();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ function replace() {
|
|
|
+ var text = cm.getRange(searchCursor.from(), searchCursor.to());
|
|
|
+ var newText = text.replace(query, replaceWith);
|
|
|
+ searchCursor.replace(newText);
|
|
|
+ }
|
|
|
+ function next() {
|
|
|
+ var found;
|
|
|
+ while(found = searchCursor.findNext() &&
|
|
|
+ isInRange(searchCursor.from(), lineStart, lineEnd)) {
|
|
|
+ if (!global && lastPos && searchCursor.from().line == lastPos.line) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ cm.scrollIntoView(searchCursor.from(), 30);
|
|
|
+ cm.setSelection(searchCursor.from(), searchCursor.to());
|
|
|
+ lastPos = searchCursor.from();
|
|
|
+ done = false;
|
|
|
+ return;
|
|
|
}
|
|
|
- else if (!m && !a && o && param) {
|
|
|
- operators[o.ch].fn(editor, null, o.count, param);
|
|
|
- this.reset();
|
|
|
- }
|
|
|
- else if (m) {
|
|
|
- var run = function(fn) {
|
|
|
- if (fn && typeof fn === "function") { // There should always be a motion
|
|
|
- if (m.count && !motionObj.handlesCount)
|
|
|
- repeat(fn, m.count, [editor, null, m.count, param]);
|
|
|
- else
|
|
|
- fn(editor, null, m.count, param);
|
|
|
- }
|
|
|
- };
|
|
|
+ done = true;
|
|
|
+ }
|
|
|
+ function stop(close) {
|
|
|
+ if (close) { close(); }
|
|
|
+ cm.focus();
|
|
|
+ if (lastPos) {
|
|
|
+ cm.setCursor(lastPos);
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ vim.exMode = false;
|
|
|
+ vim.lastHPos = vim.lastHSPos = lastPos.ch;
|
|
|
+ }
|
|
|
+ if (callback) { callback(); }
|
|
|
+ }
|
|
|
+ function onPromptKeyDown(e, _value, close) {
|
|
|
+ CodeMirror.e_stop(e);
|
|
|
+ var keyName = CodeMirror.keyName(e);
|
|
|
+ switch (keyName) {
|
|
|
+ case 'Y':
|
|
|
+ replace(); next(); break;
|
|
|
+ case 'N':
|
|
|
+ next(); break;
|
|
|
+ case 'A':
|
|
|
+ var savedCallback = callback;
|
|
|
+ callback = undefined;
|
|
|
+ cm.operation(replaceAll);
|
|
|
+ callback = savedCallback;
|
|
|
+ break;
|
|
|
+ case 'L':
|
|
|
+ replace();
|
|
|
+ case 'Q':
|
|
|
+ case 'Esc':
|
|
|
+ case 'Ctrl-C':
|
|
|
+ case 'Ctrl-[':
|
|
|
+ stop(close);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ if (done) { stop(close); }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ next();
|
|
|
+ if (done) {
|
|
|
+ showConfirm(cm, 'No matches for ' + query.source);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (!confirm) {
|
|
|
+ replaceAll();
|
|
|
+ if (callback) { callback(); };
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ showPrompt(cm, {
|
|
|
+ prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)',
|
|
|
+ onKeyDown: onPromptKeyDown
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- var motionObj = motions[m.ch];
|
|
|
- var selectable = motionObj.sel;
|
|
|
+ CodeMirror.keyMap.vim = {
|
|
|
+ attach: attachVimMap,
|
|
|
+ detach: detachVimMap
|
|
|
+ };
|
|
|
|
|
|
- if (!o) {
|
|
|
- if ((util.onVisualMode || util.onVisualLineMode) && selectable)
|
|
|
- run(motionObj.sel);
|
|
|
- else
|
|
|
- run(motionObj.nav);
|
|
|
- }
|
|
|
- else if (selectable) {
|
|
|
- repeat(function() {
|
|
|
- run(motionObj.sel);
|
|
|
- operators[o.ch].fn(editor, editor.getSelectionRange(),
|
|
|
- o.count, motionObj.param ? motionObj : param);
|
|
|
- }, o.count || 1);
|
|
|
- }
|
|
|
- this.reset();
|
|
|
- }
|
|
|
- else if (a) {
|
|
|
- a.fn(editor, editor.getSelectionRange(), a.count, param);
|
|
|
- this.reset();
|
|
|
+ function exitInsertMode(cm) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ 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;
|
|
|
+ }
|
|
|
}
|
|
|
- handleCursorMove(editor);
|
|
|
- },
|
|
|
+ lastChange.changes = text;
|
|
|
+ cm.off('change', onChange);
|
|
|
+ CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
|
|
|
+ }
|
|
|
+ if (!isPlaying && vim.insertModeRepeat > 1) {
|
|
|
+ repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
|
|
|
+ true /** repeatForInsert */);
|
|
|
+ vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
|
|
|
+ }
|
|
|
+ delete vim.insertModeRepeat;
|
|
|
+ vim.insertMode = false;
|
|
|
+ cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
|
|
|
+ cm.setOption('keyMap', 'vim');
|
|
|
+ cm.setOption('disableInput', true);
|
|
|
+ cm.toggleOverwrite(false); // exit replace mode if we were in it.
|
|
|
+ insertModeChangeRegister.setText(lastChange.changes.join(''));
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
|
|
|
+ if (macroModeState.isRecording) {
|
|
|
+ logInsertModeChange(macroModeState);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ defineOption('insertModeEscKeysTimeout', 200, 'number');
|
|
|
|
|
|
- isAccepting: function(type) {
|
|
|
- return this.accepting.indexOf(type) !== -1;
|
|
|
- },
|
|
|
+ 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
|
|
|
+ };
|
|
|
+
|
|
|
+ CodeMirror.keyMap['await-second'] = {
|
|
|
+ fallthrough: ['vim-insert'],
|
|
|
+ attach: attachVimMap,
|
|
|
+ detach: detachVimMap
|
|
|
+ };
|
|
|
|
|
|
- reset: function() {
|
|
|
- this.operator = null;
|
|
|
- this.motion = null;
|
|
|
- this.currentCount = "";
|
|
|
- this.pendingCount = "";
|
|
|
- this.status = "";
|
|
|
- this.accepting = [NUMBER, OPERATOR, MOTION, ACTION];
|
|
|
- this.idle = true;
|
|
|
- this.waitingForParam = null;
|
|
|
+ CodeMirror.keyMap['vim-replace'] = {
|
|
|
+ 'Backspace': 'goCharLeft',
|
|
|
+ fallthrough: ['vim-insert'],
|
|
|
+ attach: attachVimMap,
|
|
|
+ detach: detachVimMap
|
|
|
+ };
|
|
|
+
|
|
|
+ function executeMacroRegister(cm, vim, macroModeState, registerName) {
|
|
|
+ var register = vimGlobalState.registerController.getRegister(registerName);
|
|
|
+ var keyBuffer = register.keyBuffer;
|
|
|
+ var imc = 0;
|
|
|
+ macroModeState.isPlaying = true;
|
|
|
+ macroModeState.replaySearchQueries = register.searchQueries.slice(0);
|
|
|
+ for (var i = 0; i < keyBuffer.length; i++) {
|
|
|
+ var text = keyBuffer[i];
|
|
|
+ var match, key;
|
|
|
+ while (text) {
|
|
|
+ match = (/<\w+-.+?>|<\w+>|./).exec(text);
|
|
|
+ key = match[0];
|
|
|
+ text = text.substring(match.index + key.length);
|
|
|
+ CodeMirror.Vim.handleKey(cm, key, 'macro');
|
|
|
+ if (vim.insertMode) {
|
|
|
+ var changes = register.insertModeChanges[imc++].changes;
|
|
|
+ vimGlobalState.macroModeState.lastInsertModeChanges.changes =
|
|
|
+ changes;
|
|
|
+ repeatInsertModeChanges(cm, changes, 1);
|
|
|
+ exitInsertMode(cm);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ macroModeState.isPlaying = false;
|
|
|
}
|
|
|
-};
|
|
|
|
|
|
-function setPreviousCommand(fn) {
|
|
|
- inputBuffer.previous = { action: { action: { fn: fn } } };
|
|
|
-}
|
|
|
+ function logKey(macroModeState, key) {
|
|
|
+ if (macroModeState.isPlaying) { return; }
|
|
|
+ var registerName = macroModeState.latestRegister;
|
|
|
+ var register = vimGlobalState.registerController.getRegister(registerName);
|
|
|
+ if (register) {
|
|
|
+ register.pushText(key);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ function logInsertModeChange(macroModeState) {
|
|
|
+ if (macroModeState.isPlaying) { return; }
|
|
|
+ var registerName = macroModeState.latestRegister;
|
|
|
+ var register = vimGlobalState.registerController.getRegister(registerName);
|
|
|
+ if (register) {
|
|
|
+ register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
-exports.coreCommands = {
|
|
|
- start: {
|
|
|
- exec: function start(editor) {
|
|
|
- util.insertMode(editor);
|
|
|
- setPreviousCommand(start);
|
|
|
+ function logSearchQuery(macroModeState, query) {
|
|
|
+ if (macroModeState.isPlaying) { return; }
|
|
|
+ var registerName = macroModeState.latestRegister;
|
|
|
+ var register = vimGlobalState.registerController.getRegister(registerName);
|
|
|
+ if (register) {
|
|
|
+ register.pushSearchQuery(query);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ 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'
|
|
|
+ || changeObj.origin === undefined /* only in testing */) {
|
|
|
+ var text = changeObj.text.join('\n');
|
|
|
+ lastChange.changes.push(text);
|
|
|
+ }
|
|
|
+ changeObj = changeObj.next;
|
|
|
}
|
|
|
- },
|
|
|
- startBeginning: {
|
|
|
- exec: function startBeginning(editor) {
|
|
|
- editor.navigateLineStart();
|
|
|
- util.insertMode(editor);
|
|
|
- setPreviousCommand(startBeginning);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function onCursorActivity(cm) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ if (vim.insertMode) {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ if (macroModeState.isPlaying) { return; }
|
|
|
+ var lastChange = macroModeState.lastInsertModeChanges;
|
|
|
+ if (lastChange.expectCursorActivityForChange) {
|
|
|
+ lastChange.expectCursorActivityForChange = false;
|
|
|
+ } else {
|
|
|
+ lastChange.changes = [];
|
|
|
}
|
|
|
- },
|
|
|
- stop: {
|
|
|
- exec: function stop(editor) {
|
|
|
- inputBuffer.reset();
|
|
|
- util.onVisualMode = false;
|
|
|
- util.onVisualLineMode = false;
|
|
|
- inputBuffer.lastInsertCommands = util.normalMode(editor);
|
|
|
+ } else if (!cm.curOp.isVimOp) {
|
|
|
+ handleExternalSelection(cm, vim);
|
|
|
+ }
|
|
|
+ if (vim.visualMode) {
|
|
|
+ updateFakeCursor(cm);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function updateFakeCursor(cm) {
|
|
|
+ var vim = cm.state.vim;
|
|
|
+ var from = copyCursor(vim.sel.head);
|
|
|
+ var to = offsetCursor(from, 0, 1);
|
|
|
+ if (vim.fakeCursor) {
|
|
|
+ vim.fakeCursor.clear();
|
|
|
+ }
|
|
|
+ vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
|
|
|
+ }
|
|
|
+ function handleExternalSelection(cm, vim) {
|
|
|
+ var anchor = cm.getCursor('anchor');
|
|
|
+ var head = cm.getCursor('head');
|
|
|
+ if (vim.visualMode && cursorEqual(head, anchor) && lineLength(cm, head.line) > head.ch) {
|
|
|
+ exitVisualMode(cm, false);
|
|
|
+ } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
|
|
|
+ vim.visualMode = true;
|
|
|
+ vim.visualLine = false;
|
|
|
+ CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
|
|
|
+ }
|
|
|
+ if (vim.visualMode) {
|
|
|
+ var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
|
|
|
+ var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
|
|
|
+ head = offsetCursor(head, 0, headOffset);
|
|
|
+ anchor = offsetCursor(anchor, 0, anchorOffset);
|
|
|
+ vim.sel = {
|
|
|
+ anchor: anchor,
|
|
|
+ head: head
|
|
|
+ };
|
|
|
+ updateMark(cm, vim, '<', cursorMin(head, anchor));
|
|
|
+ updateMark(cm, vim, '>', cursorMax(head, anchor));
|
|
|
+ } else if (!vim.insertMode) {
|
|
|
+ vim.lastHPos = cm.getCursor().ch;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function InsertModeKey(keyName) {
|
|
|
+ this.keyName = keyName;
|
|
|
+ }
|
|
|
+ function onKeyEventTargetKeyDown(e) {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ var lastChange = macroModeState.lastInsertModeChanges;
|
|
|
+ var keyName = CodeMirror.keyName(e);
|
|
|
+ function onKeyFound() {
|
|
|
+ lastChange.changes.push(new InsertModeKey(keyName));
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
|
|
|
+ CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
|
|
|
+ var macroModeState = vimGlobalState.macroModeState;
|
|
|
+ macroModeState.isPlaying = true;
|
|
|
+ var isAction = !!vim.lastEditActionCommand;
|
|
|
+ var cachedInputState = vim.inputState;
|
|
|
+ function repeatCommand() {
|
|
|
+ if (isAction) {
|
|
|
+ commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
|
|
|
+ } else {
|
|
|
+ commandDispatcher.evalInput(cm, vim);
|
|
|
}
|
|
|
- },
|
|
|
- append: {
|
|
|
- exec: function append(editor) {
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- var lineLen = editor.session.getLine(pos.row).length;
|
|
|
- if (lineLen)
|
|
|
- editor.navigateRight();
|
|
|
- util.insertMode(editor);
|
|
|
- setPreviousCommand(append);
|
|
|
+ }
|
|
|
+ function repeatInsert(repeat) {
|
|
|
+ if (macroModeState.lastInsertModeChanges.changes.length > 0) {
|
|
|
+ repeat = !vim.lastEditActionCommand ? 1 : repeat;
|
|
|
+ var changeObject = macroModeState.lastInsertModeChanges;
|
|
|
+ repeatInsertModeChanges(cm, changeObject.changes, repeat);
|
|
|
}
|
|
|
- },
|
|
|
- appendEnd: {
|
|
|
- exec: function appendEnd(editor) {
|
|
|
- editor.navigateLineEnd();
|
|
|
- util.insertMode(editor);
|
|
|
- setPreviousCommand(appendEnd);
|
|
|
+ }
|
|
|
+ vim.inputState = vim.lastEditInputState;
|
|
|
+ if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
|
|
|
+ for (var i = 0; i < repeat; i++) {
|
|
|
+ repeatCommand();
|
|
|
+ repeatInsert(1);
|
|
|
}
|
|
|
- }
|
|
|
-};
|
|
|
+ } else {
|
|
|
+ if (!repeatForInsert) {
|
|
|
+ repeatCommand();
|
|
|
+ }
|
|
|
+ repeatInsert(repeat);
|
|
|
+ }
|
|
|
+ vim.inputState = cachedInputState;
|
|
|
+ if (vim.insertMode && !repeatForInsert) {
|
|
|
+ exitInsertMode(cm);
|
|
|
+ }
|
|
|
+ macroModeState.isPlaying = false;
|
|
|
+ };
|
|
|
|
|
|
-var handleCursorMove = exports.onCursorMove = function(editor, e) {
|
|
|
- if (util.currentMode === 'insert' || handleCursorMove.running)
|
|
|
- return;
|
|
|
- else if(!editor.selection.isEmpty()) {
|
|
|
- handleCursorMove.running = true;
|
|
|
- if (util.onVisualLineMode) {
|
|
|
- var originRow = editor.selection.visualLineStart;
|
|
|
- var cursorRow = editor.getCursorPosition().row;
|
|
|
- if(originRow <= cursorRow) {
|
|
|
- var endLine = editor.session.getLine(cursorRow);
|
|
|
- editor.selection.moveTo(originRow, 0);
|
|
|
- editor.selection.selectTo(cursorRow, endLine.length);
|
|
|
- } else {
|
|
|
- var endLine = editor.session.getLine(originRow);
|
|
|
- editor.selection.moveTo(originRow, endLine.length);
|
|
|
- editor.selection.selectTo(cursorRow, 0);
|
|
|
- }
|
|
|
+ function repeatInsertModeChanges(cm, changes, repeat) {
|
|
|
+ function keyHandler(binding) {
|
|
|
+ if (typeof binding == 'string') {
|
|
|
+ CodeMirror.commands[binding](cm);
|
|
|
+ } else {
|
|
|
+ binding(cm);
|
|
|
}
|
|
|
- handleCursorMove.running = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- else {
|
|
|
- if (e && (util.onVisualLineMode || util.onVisualMode)) {
|
|
|
- editor.selection.clearSelection();
|
|
|
- util.normalMode(editor);
|
|
|
+ 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);
|
|
|
+ repeat = cm.listSelections().length;
|
|
|
+ cm.setCursor(head);
|
|
|
+ }
|
|
|
+ for (var i = 0; i < repeat; i++) {
|
|
|
+ if (inVisualBlock) {
|
|
|
+ cm.setCursor(offsetCursor(head, i, 0));
|
|
|
}
|
|
|
-
|
|
|
- handleCursorMove.running = true;
|
|
|
- var pos = editor.getCursorPosition();
|
|
|
- var lineLen = editor.session.getLine(pos.row).length;
|
|
|
-
|
|
|
- if (lineLen && pos.column === lineLen)
|
|
|
- editor.navigateLeft();
|
|
|
- handleCursorMove.running = false;
|
|
|
+ for (var j = 0; j < changes.length; j++) {
|
|
|
+ var change = changes[j];
|
|
|
+ if (change instanceof InsertModeKey) {
|
|
|
+ CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
|
|
|
+ } else {
|
|
|
+ var cur = cm.getCursor();
|
|
|
+ cm.replaceRange(change, cur, cur);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (inVisualBlock) {
|
|
|
+ cm.setCursor(offsetCursor(head, 0, 1));
|
|
|
+ }
|
|
|
}
|
|
|
-};
|
|
|
-});
|
|
|
|
|
|
-ace.define("ace/keyboard/vim",["require","exports","module","ace/keyboard/vim/commands","ace/keyboard/vim/maps/util","ace/lib/useragent"], function(require, exports, module) {
|
|
|
-"use strict";
|
|
|
+ resetVimGlobalState();
|
|
|
+ CodeMirror.Vim = Vim();
|
|
|
+
|
|
|
+ Vim = CodeMirror.Vim;
|
|
|
|
|
|
-var cmds = require("./vim/commands");
|
|
|
-var coreCommands = cmds.coreCommands;
|
|
|
-var util = require("./vim/maps/util");
|
|
|
-var useragent = require("../lib/useragent");
|
|
|
+ specialKey = {'return':'CR',backspace:'BS','delete':'Del',esc:'Esc',
|
|
|
+ left:'Left',right:'Right',up:'Up',down:'Down',space: 'Space',
|
|
|
+ home:'Home',end:'End',pageup:'PageUp',pagedown:'PageDown', enter: 'CR'
|
|
|
+ };
|
|
|
+ function lookupKey(hashId, key, e) {
|
|
|
+ if (key.length > 1 && key[0] == "n") {
|
|
|
+ key = key.replace("numpad", "");
|
|
|
+ }
|
|
|
+ key = specialKey[key] || key;
|
|
|
+ var name = '';
|
|
|
+ if (e.ctrlKey) { name += 'C-'; }
|
|
|
+ if (e.altKey) { name += 'A-'; }
|
|
|
+ if (e.shiftKey) { name += 'S-'; }
|
|
|
|
|
|
-var startCommands = {
|
|
|
- "i": {
|
|
|
- command: coreCommands.start
|
|
|
+ name += key;
|
|
|
+ if (name.length > 1) { name = '<' + name + '>'; }
|
|
|
+ return name;
|
|
|
+ }
|
|
|
+ var handleKey = Vim.handleKey
|
|
|
+ Vim.handleKey = function(cm, key, origin) {
|
|
|
+ return cm.operation(function() {
|
|
|
+ return handleKey(cm, key, origin);
|
|
|
+ }, true);
|
|
|
+ }
|
|
|
+ function cloneVimState(state) {
|
|
|
+ var n = new state.constructor();
|
|
|
+ Object.keys(state).forEach(function(key) {
|
|
|
+ var o = state[key];
|
|
|
+ if (Array.isArray(o))
|
|
|
+ o = o.slice();
|
|
|
+ else if (o && typeof o == "object" && o.constructor != Object)
|
|
|
+ o = cloneVimState(o);
|
|
|
+ n[key] = o;
|
|
|
+ });
|
|
|
+ if (state.sel) {
|
|
|
+ n.sel = {
|
|
|
+ head: state.sel.head && copyCursor(state.sel.head),
|
|
|
+ anchor: state.sel.anchor && copyCursor(state.sel.anchor)
|
|
|
+ };
|
|
|
+ }
|
|
|
+ return n;
|
|
|
+ }
|
|
|
+ function multiSelectHandleKey(cm, key, origin) {
|
|
|
+ var isHandled = false;
|
|
|
+ var vim = Vim.maybeInitVimState_(cm);
|
|
|
+ var visualBlock = vim.visualBlock || vim.wasInVisualBlock;
|
|
|
+ if (vim.wasInVisualBlock && !cm.ace.inMultiSelectMode) {
|
|
|
+ vim.wasInVisualBlock = false;
|
|
|
+ } else if (cm.ace.inMultiSelectMode && vim.visualBlock) {
|
|
|
+ vim.wasInVisualBlock = true;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (key == '<Esc>' && !vim.insertMode && !vim.visualMode && cm.ace.inMultiSelectMode) {
|
|
|
+ cm.ace.exitMultiSelectMode();
|
|
|
+ } else if (visualBlock || !cm.ace.inMultiSelectMode || cm.ace.inVirtualSelectionMode) {
|
|
|
+ isHandled = Vim.handleKey(cm, key, origin);
|
|
|
+ } else {
|
|
|
+ var old = cloneVimState(vim);
|
|
|
+ cm.operation(function() {
|
|
|
+ cm.ace.forEachSelection(function() {
|
|
|
+ var sel = cm.ace.selection;
|
|
|
+ cm.state.vim.lastHPos = sel.$desiredColumn == null ? sel.lead.column : sel.$desiredColumn;
|
|
|
+ var head = cm.getCursor("head");
|
|
|
+ var anchor = cm.getCursor("anchor");
|
|
|
+ var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
|
|
|
+ var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
|
|
|
+ head = offsetCursor(head, 0, headOffset);
|
|
|
+ anchor = offsetCursor(anchor, 0, anchorOffset);
|
|
|
+ cm.state.vim.sel.head = head;
|
|
|
+ cm.state.vim.sel.anchor = anchor;
|
|
|
+
|
|
|
+ isHandled = handleKey(cm, key, origin);
|
|
|
+ sel.$desiredColumn = cm.state.vim.lastHPos == -1 ? null : cm.state.vim.lastHPos;
|
|
|
+ if (cm.virtualSelectionMode()) {
|
|
|
+ cm.state.vim = cloneVimState(old);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ if (cm.curOp.cursorActivity && !isHandled)
|
|
|
+ cm.curOp.cursorActivity = false;
|
|
|
+ }, true);
|
|
|
+ }
|
|
|
+ return isHandled;
|
|
|
+ };
|
|
|
+ exports.CodeMirror = CodeMirror;
|
|
|
+ var getVim = Vim.maybeInitVimState_;
|
|
|
+ exports.handler = {
|
|
|
+ $id: "ace/keyboard/vim",
|
|
|
+ drawCursor: function(style, pixelPos, config, sel, session) {
|
|
|
+ var vim = this.state.vim || {};
|
|
|
+ var w = config.characterWidth;
|
|
|
+ var h = config.lineHeight;
|
|
|
+ var top = pixelPos.top;
|
|
|
+ var left = pixelPos.left;
|
|
|
+ if (!vim.insertMode) {
|
|
|
+ var isbackwards = !sel.cursor
|
|
|
+ ? session.selection.isBackwards() || session.selection.isEmpty()
|
|
|
+ : Range.comparePoints(sel.cursor, sel.start) <= 0
|
|
|
+ if (!isbackwards && left > w)
|
|
|
+ left -= w
|
|
|
+ }
|
|
|
+ if (!vim.insertMode && vim.status) {
|
|
|
+ h = h / 2;
|
|
|
+ top += h;
|
|
|
+ }
|
|
|
+ style.left = left + "px";
|
|
|
+ style.top = top + "px";
|
|
|
+ style.width = w + "px";
|
|
|
+ style.height = h + "px";
|
|
|
},
|
|
|
- "I": {
|
|
|
- command: coreCommands.startBeginning
|
|
|
+ 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 (key == "c" && hashId == 1) { // key == "ctrl-c"
|
|
|
+ if (!useragent.isMac && editor.getCopyText()) {
|
|
|
+ editor.once("copy", function() {
|
|
|
+ editor.selection.clearSelection();
|
|
|
+ });
|
|
|
+ return {command: "null", passEvent: true};
|
|
|
+ }
|
|
|
+ return {command: coreCommands.stop};
|
|
|
+ } else if (!vim.insertMode) {
|
|
|
+ if (useragent.isMac && this.handleMacRepeat(data, hashId, key)) {
|
|
|
+ hashId = -1;
|
|
|
+ key = data.inputChar;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (hashId == -1 || hashId & 1 || hashId === 0 && key.length > 1) {
|
|
|
+ var insertMode = vim.insertMode;
|
|
|
+ var name = lookupKey(hashId, key, e || {});
|
|
|
+ if (vim.status == null)
|
|
|
+ vim.status = "";
|
|
|
+ var isHandled = multiSelectHandleKey(cm, name, 'user');
|
|
|
+ vim = getVim(cm); // may be changed by multiSelectHandleKey
|
|
|
+ if (isHandled && vim.status != null)
|
|
|
+ vim.status += name;
|
|
|
+ else if (vim.status == null)
|
|
|
+ vim.status = "";
|
|
|
+ cm._signal("changeStatus");
|
|
|
+ if (!isHandled && (hashId != -1 || insertMode))
|
|
|
+ return;
|
|
|
+ return {command: "null", passEvent: !isHandled};
|
|
|
+ }
|
|
|
},
|
|
|
- "a": {
|
|
|
- command: coreCommands.append
|
|
|
+ attach: function(editor) {
|
|
|
+ if (!editor.state) editor.state = {};
|
|
|
+ var cm = new CodeMirror(editor);
|
|
|
+ editor.state.cm = cm;
|
|
|
+ editor.$vimModeHandler = this;
|
|
|
+ CodeMirror.keyMap.vim.attach(cm);
|
|
|
+ getVim(cm).status = null;
|
|
|
+ cm.on('vim-command-done', function() {
|
|
|
+ if (cm.virtualSelectionMode()) return;
|
|
|
+ getVim(cm).status = null;
|
|
|
+ cm.ace._signal("changeStatus");
|
|
|
+ cm.ace.session.markUndoGroup();
|
|
|
+ });
|
|
|
+ cm.on("changeStatus", function() {
|
|
|
+ cm.ace.renderer.updateCursor();
|
|
|
+ cm.ace._signal("changeStatus");
|
|
|
+ });
|
|
|
+ cm.on("vim-mode-change", function() {
|
|
|
+ if (cm.virtualSelectionMode()) return;
|
|
|
+ cm.ace.renderer.setStyle("normal-mode", !getVim(cm).insertMode);
|
|
|
+ cm._signal("changeStatus");
|
|
|
+ });
|
|
|
+ cm.ace.renderer.setStyle("normal-mode", !getVim(cm).insertMode);
|
|
|
+ editor.renderer.$cursorLayer.drawCursor = this.drawCursor.bind(cm);
|
|
|
+ this.updateMacCompositionHandlers(editor, true);
|
|
|
},
|
|
|
- "A": {
|
|
|
- command: coreCommands.appendEnd
|
|
|
+ detach: function(editor) {
|
|
|
+ var cm = editor.state.cm;
|
|
|
+ CodeMirror.keyMap.vim.detach(cm);
|
|
|
+ cm.destroy();
|
|
|
+ editor.state.cm = null;
|
|
|
+ editor.$vimModeHandler = null;
|
|
|
+ editor.renderer.$cursorLayer.drawCursor = null;
|
|
|
+ editor.renderer.setStyle("normal-mode", false);
|
|
|
+ this.updateMacCompositionHandlers(editor, false);
|
|
|
},
|
|
|
- "ctrl-f": {
|
|
|
- command: "gotopagedown"
|
|
|
+ getStatusText: function(editor) {
|
|
|
+ var cm = editor.state.cm;
|
|
|
+ var vim = getVim(cm);
|
|
|
+ if (vim.insertMode)
|
|
|
+ return "INSERT";
|
|
|
+ var status = "";
|
|
|
+ if (vim.visualMode) {
|
|
|
+ status += "VISUAL";
|
|
|
+ if (vim.visualLine)
|
|
|
+ status += " LINE";
|
|
|
+ if (vim.visualBlock)
|
|
|
+ status += " BLOCK";
|
|
|
+ }
|
|
|
+ if (vim.status)
|
|
|
+ status += (status ? " " : "") + vim.status;
|
|
|
+ return status;
|
|
|
},
|
|
|
- "ctrl-b": {
|
|
|
- command: "gotopageup"
|
|
|
- }
|
|
|
-};
|
|
|
-
|
|
|
-exports.handler = {
|
|
|
- $id: "ace/keyboard/vim",
|
|
|
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";
|
|
|
+ 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) {
|
|
|
- if (util.currentMode !== "insert") {
|
|
|
- var el = this.textInput.getElement();
|
|
|
- el.blur();
|
|
|
- el.focus();
|
|
|
- el.value = text;
|
|
|
- } else {
|
|
|
- this.onCompositionUpdateOrig(text);
|
|
|
- }
|
|
|
- };
|
|
|
- var onCompositionStartOverride = function(text) {
|
|
|
- if (util.currentMode === "insert") {
|
|
|
- this.onCompositionStartOrig(text);
|
|
|
- }
|
|
|
- };
|
|
|
- if (enable) {
|
|
|
- if (!editor.onCompositionUpdateOrig) {
|
|
|
- editor.onCompositionUpdateOrig = editor.onCompositionUpdate;
|
|
|
- editor.onCompositionUpdate = onCompositionUpdateOverride;
|
|
|
- editor.onCompositionStartOrig = editor.onCompositionStart;
|
|
|
- editor.onCompositionStart = onCompositionStartOverride;
|
|
|
- }
|
|
|
+ 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 {
|
|
|
- if (editor.onCompositionUpdateOrig) {
|
|
|
- editor.onCompositionUpdate = editor.onCompositionUpdateOrig;
|
|
|
- editor.onCompositionUpdateOrig = null;
|
|
|
- editor.onCompositionStart = editor.onCompositionStartOrig;
|
|
|
- editor.onCompositionStartOrig = null;
|
|
|
- }
|
|
|
+ this.onCompositionUpdateOrig(text);
|
|
|
}
|
|
|
- },
|
|
|
-
|
|
|
- handleKeyboard: function(data, hashId, key, keyCode, e) {
|
|
|
- if (hashId !== 0 && (!key || keyCode == -1))
|
|
|
- return null;
|
|
|
-
|
|
|
- var editor = data.editor;
|
|
|
- var vimState = data.vimState || "start";
|
|
|
-
|
|
|
- if (hashId == 1)
|
|
|
- key = "ctrl-" + key;
|
|
|
- if (key == "ctrl-c") {
|
|
|
- if (!useragent.isMac && editor.getCopyText()) {
|
|
|
- editor.once("copy", function() {
|
|
|
- if (vimState == "start")
|
|
|
- coreCommands.stop.exec(editor);
|
|
|
- else
|
|
|
- editor.selection.clearSelection();
|
|
|
- });
|
|
|
- return {command: "null", passEvent: true};
|
|
|
- }
|
|
|
- return {command: coreCommands.stop};
|
|
|
- } else if ((key == "esc" && hashId === 0) || key == "ctrl-[") {
|
|
|
- return {command: coreCommands.stop};
|
|
|
- } else if (vimState == "start") {
|
|
|
- if (useragent.isMac && this.handleMacRepeat(data, hashId, key)) {
|
|
|
- hashId = -1;
|
|
|
- key = data.inputChar;
|
|
|
- }
|
|
|
-
|
|
|
- if (hashId == -1 || hashId == 1 || hashId === 0 && key.length > 1) {
|
|
|
- if (cmds.inputBuffer.idle && startCommands[key])
|
|
|
- return startCommands[key];
|
|
|
- var isHandled = cmds.inputBuffer.push(editor, key);
|
|
|
- if (!isHandled && hashId !== -1)
|
|
|
- return;
|
|
|
- return {command: "null", passEvent: !isHandled};
|
|
|
- } else if (key == "esc" && hashId === 0) {
|
|
|
- return {command: coreCommands.stop};
|
|
|
- }
|
|
|
- else if (hashId === 0 || hashId == 4) {
|
|
|
- return {command: "null", passEvent: true};
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (key == "ctrl-w") {
|
|
|
- return {command: "removewordleft"};
|
|
|
- }
|
|
|
+ };
|
|
|
+ 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.on("click", exports.onCursorMove);
|
|
|
- if (util.currentMode !== "insert")
|
|
|
- cmds.coreCommands.stop.exec(editor);
|
|
|
- editor.$vimModeHandler = this;
|
|
|
-
|
|
|
- this.updateMacCompositionHandlers(editor, true);
|
|
|
+ editor.renderer.$gutterLayer.$renderer = this;
|
|
|
+ editor.on("changeSelection", this.update);
|
|
|
},
|
|
|
-
|
|
|
detach: function(editor) {
|
|
|
- editor.removeListener("click", exports.onCursorMove);
|
|
|
- util.noMode(editor);
|
|
|
- util.currentMode = "normal";
|
|
|
- this.updateMacCompositionHandlers(editor, false);
|
|
|
+ editor.renderer.$gutterLayer.$renderer = null;
|
|
|
+ editor.off("changeSelection", this.update);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ Vim.defineOption({
|
|
|
+ name: "wrap",
|
|
|
+ set: function(value, cm) {
|
|
|
+ if (cm) {cm.ace.setOption("wrap", value)}
|
|
|
},
|
|
|
-
|
|
|
- actions: cmds.actions,
|
|
|
- getStatusText: function() {
|
|
|
- if (util.currentMode == "insert")
|
|
|
- return "INSERT";
|
|
|
- if (util.onVisualMode)
|
|
|
- return (util.onVisualLineMode ? "VISUAL LINE " : "VISUAL ") + cmds.inputBuffer.status;
|
|
|
- return cmds.inputBuffer.status;
|
|
|
+ type: "boolean"
|
|
|
+ }, false);
|
|
|
+ defaultKeymap.push(
|
|
|
+ { keys: 'zc', type: 'action', action: 'fold', actionArgs: { open: false } },
|
|
|
+ { keys: 'zC', type: 'action', action: 'fold', actionArgs: { open: false, all: true } },
|
|
|
+ { keys: 'zo', type: 'action', action: 'fold', actionArgs: { open: true, } },
|
|
|
+ { keys: 'zO', type: 'action', action: 'fold', actionArgs: { open: true, all: true } },
|
|
|
+ { keys: 'za', type: 'action', action: 'fold', actionArgs: { toggle: true } },
|
|
|
+ { keys: 'zA', type: 'action', action: 'fold', actionArgs: { toggle: true, all: true } },
|
|
|
+ { keys: 'zf', type: 'action', action: 'fold', actionArgs: { open: true, all: true } },
|
|
|
+ { keys: 'zd', type: 'action', action: 'fold', actionArgs: { open: true, all: true } },
|
|
|
+
|
|
|
+ { keys: '<C-A-j>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorAbove" } },
|
|
|
+ { keys: '<C-A-k>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorBelow" } },
|
|
|
+ { keys: '<C-A-S-j>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorAboveSkipCurrent" } },
|
|
|
+ { keys: '<C-A-S-k>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorBelowSkipCurrent" } },
|
|
|
+ { keys: '<C-A-h>', type: 'action', action: 'aceCommand', actionArgs: { name: "selectMoreBefore" } },
|
|
|
+ { keys: '<C-A-l>', type: 'action', action: 'aceCommand', actionArgs: { name: "selectMoreAfter" } },
|
|
|
+ { keys: '<C-A-S-h>', type: 'action', action: 'aceCommand', actionArgs: { name: "selectNextBefore" } },
|
|
|
+ { keys: '<C-A-S-l>', type: 'action', action: 'aceCommand', actionArgs: { name: "selectNextAfter" } }
|
|
|
+ );
|
|
|
+ actions.aceCommand = function(cm, actionArgs, vim) {
|
|
|
+ cm.vimCmd = actionArgs;
|
|
|
+ if (cm.ace.inVirtualSelectionMode)
|
|
|
+ cm.ace.on("beforeEndOperation", delayedExecAceCommand);
|
|
|
+ else
|
|
|
+ delayedExecAceCommand(null, cm.ace)
|
|
|
+ };
|
|
|
+ function delayedExecAceCommand(op, ace) {
|
|
|
+ ace.off("beforeEndOperation", delayedExecAceCommand);
|
|
|
+ var cmd = ace.state.cm.vimCmd;
|
|
|
+ if (cmd) {
|
|
|
+ ace.execCommand(cmd.exec ? cmd : cmd.name, cmd.args);
|
|
|
}
|
|
|
-};
|
|
|
-
|
|
|
-
|
|
|
-exports.onCursorMove = function(e) {
|
|
|
- cmds.onCursorMove(e.editor, e);
|
|
|
- exports.onCursorMove.scheduled = false;
|
|
|
-};
|
|
|
+ ace.curOp = ace.prevOp;
|
|
|
+ }
|
|
|
+ actions.fold = function(cm, actionArgs, vim) {
|
|
|
+ cm.ace.execCommand(['toggleFoldWidget', 'toggleFoldWidget', 'foldOther', 'unfoldall'
|
|
|
+ ][(actionArgs.all ? 2 : 0) + (actionArgs.open ? 1 : 0)]);
|
|
|
+ },
|
|
|
|
|
|
+ exports.handler.defaultKeymap = defaultKeymap;
|
|
|
+
|
|
|
+ Vim.map("Y", "yy");
|
|
|
});
|
James Allen