gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 22:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Add t_<C-a> and t_<C-x>. Fix some mungeRange brokenness with selectEnd and selection size changes.

Browse Source
This commit is contained in:
Kris Maglione
2011-10-06 10:40:33 -04:00
parent d419f31a7b
commit 1e3a5f37c9
2 changed files with 93 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
common/content/editor.js
View File

@@ -243,6 +243,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
let parentIdx = Array.indexOf(parent.childNodes, let parentIdx = Array.indexOf(parent.childNodes,
range[container]); range[container]);
let delta = 0;
for (let node in Editor.TextsIterator(range)) { for (let node in Editor.TextsIterator(range)) {
let text = node.textContent; let text = node.textContent;
let start = 0, end = text.length; let start = 0, end = text.length;
@@ -261,6 +262,9 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
if (text == node.textContent) if (text == node.textContent)
continue; continue;
if (selectEnd)
delta = text.length - node.textContent.length;
if (editor instanceof Ci.nsIPlaintextEditor) { if (editor instanceof Ci.nsIPlaintextEditor) {
this.selectedRange = RangeFind.nodeContents(node); this.selectedRange = RangeFind.nodeContents(node);
editor.insertText(text); editor.insertText(text);
@@ -268,14 +272,17 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
else else
node.textContent = text; node.textContent = text;
} }
this.selection.collapse(parent.childNodes[parentIdx], idx); let node = parent.childNodes[parentIdx];
if (node instanceof Text)
idx = Math.constrain(idx + delta, 0, node.textContent.length);
this.selection.collapse(node, idx);
} }
finally { finally {
editor.endPlaceHolderTransaction(); editor.endPlaceHolderTransaction();
} }
}, },
findChar: function (key, count, backward, offset) { findChar: function findNumber(key, count, backward, offset) {
count = count || 1; // XXX ? count = count || 1; // XXX ?
offset = (offset || 0) - !!backward; offset = (offset || 0) - !!backward;
@@ -305,6 +312,44 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
return range; return range;
}, },
findNumber: function findNumber(range) {
if (!range)
range = this.selectedRange.cloneRange();
// Find digit (or \n).
Editor.extendRange(range, true, /[^\n\d]/, true);
range.collapse(false);
// Select entire number.
Editor.extendRange(range, true, /\d/, true);
Editor.extendRange(range, false, /\d/, true);
// Sanity check.
dactyl.assert(/^\d+$/.test(range));
if (false) // Skip for now.
if (range.startContainer instanceof Text && range.startOffset > 2) {
if (range.startContainer.textContent.substr(range.startOffset - 2, 2) == "0x")
range.setStart(range.startContainer, range.startOffset - 2);
}
// Grab the sign, if it's there.
Editor.extendRange(range, false, /[+-]/, true);
return range;
},
modifyNumber: function modifyNumber(delta, range) {
range = this.findNumber(range);
let number = parseInt(range) + delta;
if (/^[+-]?0x/.test(range))
number = number.toString(16).replace(/^[+-]?/, "$&0x");
else if (/^[+-]?0\d/.test(range))
number = number.toString(8).replace(/^[+-]?/, "$&0");
this.mungeRange(range, function () String(number), true);
this.selection.modify("move", "backward", "character");
},
/** /**
* Edits the given file in the external editor as specified by the * Edits the given file in the external editor as specified by the
* 'editor' option. * 'editor' option.
@@ -1031,9 +1076,8 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
bind(["<S-Insert>"], "Insert clipboard/selection", bind(["<S-Insert>"], "Insert clipboard/selection",
function () { editor.paste(); }); function () { editor.paste(); });
mappings.add([modes.INPUT], bind(["<C-i>"], "Edit text field with an external editor",
["<C-i>"], "Edit text field with an external editor", function () { editor.editFieldExternally(); });
function () { editor.editFieldExternally(); });
bind(["<C-t>"], "Edit text field in Text Edit mode", bind(["<C-t>"], "Edit text field in Text Edit mode",
function () { function () {
@@ -1073,42 +1117,47 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
mappings.add([modes.TEXT_EDIT], names, description, mappings.add([modes.TEXT_EDIT], names, description,
action, update({ type: "editor" }, params)); action, update({ type: "editor" }, params));
// text edit mode
mappings.add([modes.TEXT_EDIT],
["u"], "Undo changes",
function (args) {
editor.executeCommand("cmd_undo", Math.max(args.count, 1));
editor.deselect();
},
{ count: true });
mappings.add([modes.TEXT_EDIT], bind(["<C-a>"], "Increment the next number",
["<C-r>"], "Redo undone changes", function ({ count }) { editor.modifyNumber(count || 1) },
function (args) { { count: true });
editor.executeCommand("cmd_redo", Math.max(args.count, 1));
editor.deselect(); bind(["<C-x>"], "Decrement the next number",
}, function ({ count }) { editor.modifyNumber(-(count || 1)) },
{ count: true }); { count: true });
// text edit mode
bind(["u"], "Undo changes",
function (args) {
editor.executeCommand("cmd_undo", Math.max(args.count, 1));
editor.deselect();
},
{ count: true });
bind(["<C-r>"], "Redo undone changes",
function (args) {
editor.executeCommand("cmd_redo", Math.max(args.count, 1));
editor.deselect();
},
{ count: true });
bind(["D"], "Delete characters from the cursor to the end of the line", bind(["D"], "Delete characters from the cursor to the end of the line",
function () { editor.executeCommand("cmd_deleteToEndOfLine"); }); function () { editor.executeCommand("cmd_deleteToEndOfLine"); });
mappings.add([modes.TEXT_EDIT], bind(["o"], "Open line below current",
["o"], "Open line below current", function () {
function () { editor.executeCommand("cmd_endLine", 1);
editor.executeCommand("cmd_endLine", 1); modes.push(modes.INSERT);
modes.push(modes.INSERT); events.feedkeys("<Return>");
events.feedkeys("<Return>"); });
});
mappings.add([modes.TEXT_EDIT], bind(["O"], "Open line above current",
["O"], "Open line above current", function () {
function () { editor.executeCommand("cmd_beginLine", 1);
editor.executeCommand("cmd_beginLine", 1); modes.push(modes.INSERT);
modes.push(modes.INSERT); events.feedkeys("<Return>");
events.feedkeys("<Return>"); editor.executeCommand("cmd_linePrevious", 1);
editor.executeCommand("cmd_linePrevious", 1); });
});
bind(["X"], "Delete character to the left", bind(["X"], "Delete character to the left",
function (args) { editor.executeCommand("cmd_deleteCharBackward", Math.max(args.count, 1)); }, function (args) { editor.executeCommand("cmd_deleteCharBackward", Math.max(args.count, 1)); },
@@ -1127,13 +1176,12 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
["v", "V"], "End Visual mode", ["v", "V"], "End Visual mode",
function () { modes.pop(); }); function () { modes.pop(); });
mappings.add([modes.TEXT_EDIT], bind(["V"], "Start Visual Line mode",
["V"], "Start Visual Line mode", function () {
function () { modes.push(modes.VISUAL, modes.LINE);
modes.push(modes.VISUAL, modes.LINE); editor.executeCommand("cmd_beginLine", 1);
editor.executeCommand("cmd_beginLine", 1); editor.executeCommand("cmd_selectLineNext", 1);
editor.executeCommand("cmd_selectLineNext", 1); });
});
mappings.add([modes.VISUAL], mappings.add([modes.VISUAL],
["s"], "Change selected text", ["s"], "Change selected text",
@@ -1150,7 +1198,8 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
var selection = editor.selection; var selection = editor.selection;
else else
selection = buffer.focusedFrame.getSelection(); selection = buffer.focusedFrame.getSelection();
util.assert(selection.focusOffset);
util.assert(selection.focusNode);
let { focusOffset, anchorOffset, focusNode, anchorNode } = selection; let { focusOffset, anchorOffset, focusNode, anchorNode } = selection;
selection.collapse(focusNode, focusOffset); selection.collapse(focusNode, focusOffset);
selection.extend(anchorNode, anchorOffset); selection.extend(anchorNode, anchorOffset);

1
pentadactyl/NEWS
View File

@@ -44,6 +44,7 @@
- New searches now start within the current viewport where possible. [b8] - New searches now start within the current viewport where possible. [b8]
• Text editing improvements, including: • Text editing improvements, including:
- Added t_gu, t_gU, and v_o mappings. [b8] - Added t_gu, t_gU, and v_o mappings. [b8]
- Added t_<C-a> and t_<C-a> mappings. [b8]
- Added o_c, o_d, and o_y mappings. [b8] - Added o_c, o_d, and o_y mappings. [b8]
- Added register and basic kill ring support, t_" and I_<C-'> - Added register and basic kill ring support, t_" and I_<C-'>
mappings, and :registers command. [b8] mappings, and :registers command. [b8]