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

Partially clean up count handling in Editor.

Browse Source
This commit is contained in:
Doug Kearns
2010-11-05 02:08:23 +11:00
parent 749570aba8
commit 97147e8489
1 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
common/content/editor.js
View File

@@ -73,8 +73,9 @@ const Editor = Module("editor", {
controller.supportsCommand(cmd) && controller.supportsCommand(cmd) &&
controller.isCommandEnabled(cmd)); controller.isCommandEnabled(cmd));
if (typeof count != "number" || count < 1) // XXX: better as a precondition
count = 1; if (count == null)
count = 1;
let didCommand = false; let didCommand = false;
while (count--) { while (count--) {
@@ -95,7 +96,8 @@ const Editor = Module("editor", {
// cmd = y, d, c // cmd = y, d, c
// motion = b, 0, gg, G, etc. // motion = b, 0, gg, G, etc.
executeCommandWithMotion: function (cmd, motion, count) { executeCommandWithMotion: function (cmd, motion, count) {
if (typeof count != "number" || count < 1) // XXX: better as a precondition
if (count == null)
count = 1; count = 1;
if (cmd == motion) { if (cmd == motion) {
@@ -211,7 +213,8 @@ const Editor = Module("editor", {
this._lastFindCharFunc = this.findCharForward; this._lastFindCharFunc = this.findCharForward;
let text = Editor.getEditor().value; let text = Editor.getEditor().value;
if (!typeof count == "number" || count < 1) // XXX
if (count == null)
count = 1; count = 1;
for (let i = Editor.getEditor().selectionEnd + 1; i < text.length; i++) { for (let i = Editor.getEditor().selectionEnd + 1; i < text.length; i++) {
@@ -236,7 +239,8 @@ const Editor = Module("editor", {
this._lastFindCharFunc = this.findCharBackward; this._lastFindCharFunc = this.findCharBackward;
let text = Editor.getEditor().value; let text = Editor.getEditor().value;
if (!typeof count == "number" || count < 1) // XXX
if (count == null)
count = 1; count = 1;
for (let i = Editor.getEditor().selectionStart - 1; i >= 0; i--) { for (let i = Editor.getEditor().selectionStart - 1; i >= 0; i--) {
@@ -278,9 +282,8 @@ const Editor = Module("editor", {
return; return;
} }
let text = ""; // XXX
if (textBox) if (textBox)
text = textBox.value; var text = textBox.value;
else { else {
var editor = window.GetCurrentEditor ? GetCurrentEditor() var editor = window.GetCurrentEditor ? GetCurrentEditor()
: Editor.getEditor(document.commandDispatcher.focusedWindow); : Editor.getEditor(document.commandDispatcher.focusedWindow);
@@ -438,8 +441,8 @@ const Editor = Module("editor", {
mappings.add([modes.CARET], keys, "", mappings.add([modes.CARET], keys, "",
function (count) { function (count) {
if (typeof count != "number" || count < 1) if (!count)
count = 1; count = 1;
while (count--) while (count--)
caretExecute(false, true); caretExecute(false, true);
@@ -448,7 +451,7 @@ const Editor = Module("editor", {
mappings.add([modes.VISUAL], keys, "", mappings.add([modes.VISUAL], keys, "",
function (count) { function (count) {
if (typeof count != "number" || count < 1 || !hasCount) if (!count)
count = 1; count = 1;
let controller = buffer.selectionController; let controller = buffer.selectionController;
@@ -467,7 +470,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT], keys, "", mappings.add([modes.TEXT_EDIT], keys, "",
function (count) { function (count) {
if (typeof count != "number" || count < 1) if (!count)
count = 1; count = 1;
editor.executeCommand(textEditCommand, count); editor.executeCommand(textEditCommand, count);
@@ -478,7 +481,7 @@ const Editor = Module("editor", {
// add mappings for commands like i,a,s,c,etc. in TEXT_EDIT mode // add mappings for commands like i,a,s,c,etc. in TEXT_EDIT mode
function addBeginInsertModeMap(keys, commands) { function addBeginInsertModeMap(keys, commands) {
mappings.add([modes.TEXT_EDIT], keys, "", mappings.add([modes.TEXT_EDIT], keys, "",
function (count) { function () {
commands.forEach(function (cmd) commands.forEach(function (cmd)
editor.executeCommand(cmd, 1)); editor.executeCommand(cmd, 1));
modes.push(modes.INSERT); modes.push(modes.INSERT);
@@ -488,14 +491,18 @@ const Editor = Module("editor", {
function addMotionMap(key) { function addMotionMap(key) {
mappings.add([modes.TEXT_EDIT], [key], mappings.add([modes.TEXT_EDIT], [key],
"Motion command", "Motion command",
function (motion, count) { editor.executeCommandWithMotion(key, motion, count); }, function (motion, count) {
editor.executeCommandWithMotion(key, motion, Math.max(count, 1));
},
{ count: true, motion: true }); { count: true, motion: true });
} }
function selectPreviousLine() { function selectPreviousLine() {
editor.executeCommand("cmd_selectLinePrevious"); editor.executeCommand("cmd_selectLinePrevious");
if ((modes.extended & modes.LINE) && !editor.selectedText()) if ((modes.extended & modes.LINE) && !editor.selectedText())
editor.executeCommand("cmd_selectLinePrevious"); editor.executeCommand("cmd_selectLinePrevious");
} }
function selectNextLine() { function selectNextLine() {
editor.executeCommand("cmd_selectLineNext"); editor.executeCommand("cmd_selectLineNext");
if ((modes.extended & modes.LINE) && !editor.selectedText()) if ((modes.extended & modes.LINE) && !editor.selectedText())
@@ -606,7 +613,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["u"], "Undo changes", ["u"], "Undo changes",
function (count) { function (count) {
editor.executeCommand("cmd_undo", count); editor.executeCommand("cmd_undo", Math.max(count, 1));
editor.unselectText(); editor.unselectText();
}, },
{ count: true }); { count: true });
@@ -614,7 +621,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["<C-r>"], "Redo undone changes", ["<C-r>"], "Redo undone changes",
function (count) { function (count) {
editor.executeCommand("cmd_redo", count); editor.executeCommand("cmd_redo", Math.max(count, 1));
editor.unselectText(); editor.unselectText();
}, },
{ count: true }); { count: true });
@@ -625,7 +632,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["o"], "Open line below current", ["o"], "Open line below current",
function (count) { 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>");
@@ -633,7 +640,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["O"], "Open line above current", ["O"], "Open line above current",
function (count) { 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>");
@@ -642,12 +649,12 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["X"], "Delete character to the left", ["X"], "Delete character to the left",
function (count) { editor.executeCommand("cmd_deleteCharBackward", count); }, function (count) { editor.executeCommand("cmd_deleteCharBackward", Math.max(count, 1)); },
{ count: true }); { count: true });
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["x"], "Delete character to the right", ["x"], "Delete character to the right",
function (count) { editor.executeCommand("cmd_deleteCharForward", count); }, function (count) { editor.executeCommand("cmd_deleteCharForward", Math.max(count, 1)); },
{ count: true }); { count: true });
// visual mode // visual mode
@@ -657,11 +664,11 @@ const Editor = Module("editor", {
mappings.add([modes.VISUAL], mappings.add([modes.VISUAL],
["v", "V"], "End visual mode", ["v", "V"], "End visual mode",
function (count) { events.onEscape(); }); // XXX function () { events.onEscape(); }); // XXX
mappings.add([modes.TEXT_EDIT], mappings.add([modes.TEXT_EDIT],
["V"], "Start visual line mode", ["V"], "Start visual line mode",
function (count) { 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);
@@ -669,7 +676,7 @@ const Editor = Module("editor", {
mappings.add([modes.VISUAL], mappings.add([modes.VISUAL],
["c", "s"], "Change selected text", ["c", "s"], "Change selected text",
function (count) { function () {
dactyl.assert(editor.isTextEdit); dactyl.assert(editor.isTextEdit);
editor.executeCommand("cmd_cut"); editor.executeCommand("cmd_cut");
modes.push(modes.INSERT); modes.push(modes.INSERT);
@@ -677,7 +684,7 @@ const Editor = Module("editor", {
mappings.add([modes.VISUAL], mappings.add([modes.VISUAL],
["d"], "Delete selected text", ["d"], "Delete selected text",
function (count) { function () {
dactyl.assert(editor.isTextEdit); dactyl.assert(editor.isTextEdit);
editor.executeCommand("cmd_cut"); editor.executeCommand("cmd_cut");
modes.pop(); modes.pop();
@@ -685,7 +692,7 @@ const Editor = Module("editor", {
mappings.add([modes.VISUAL], mappings.add([modes.VISUAL],
["y"], "Yank selected text", ["y"], "Yank selected text",
function (count) { function () {
if (editor.isTextEdit) { if (editor.isTextEdit) {
editor.executeCommand("cmd_copy"); editor.executeCommand("cmd_copy");
modes.pop(); modes.pop();
@@ -699,9 +706,9 @@ const Editor = Module("editor", {
function (count) { function (count) {
dactyl.assert(!editor.isCaret); dactyl.assert(!editor.isCaret);
if (!count) if (!count)
count = 1; count = 1
while (count--) while (count--)
editor.executeCommand("cmd_paste"); editor.executeCommand("cmd_paste", count);
modes.pop(modes.TEXT_EDIT); modes.pop(modes.TEXT_EDIT);
}, },
{ count: true }); { count: true });
@@ -710,7 +717,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT, modes.VISUAL], mappings.add([modes.TEXT_EDIT, modes.VISUAL],
["f"], "Move to a character on the current line after the cursor", ["f"], "Move to a character on the current line after the cursor",
function (count, arg) { function (count, arg) {
let pos = editor.findCharForward(arg, count); let pos = editor.findCharForward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos, true, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos, true, dactyl.mode == modes.VISUAL);
}, },
@@ -719,7 +726,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT, modes.VISUAL], mappings.add([modes.TEXT_EDIT, modes.VISUAL],
["F"], "Move to a character on the current line before the cursor", ["F"], "Move to a character on the current line before the cursor",
function (count, arg) { function (count, arg) {
let pos = editor.findCharBackward(arg, count); let pos = editor.findCharBackward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos, false, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos, false, dactyl.mode == modes.VISUAL);
}, },
@@ -728,7 +735,7 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT, modes.VISUAL], mappings.add([modes.TEXT_EDIT, modes.VISUAL],
["t"], "Move before a character on the current line", ["t"], "Move before a character on the current line",
function (count, arg) { function (count, arg) {
let pos = editor.findCharForward(arg, count); let pos = editor.findCharForward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos - 1, true, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos - 1, true, dactyl.mode == modes.VISUAL);
}, },
@@ -737,21 +744,21 @@ const Editor = Module("editor", {
mappings.add([modes.TEXT_EDIT, modes.VISUAL], mappings.add([modes.TEXT_EDIT, modes.VISUAL],
["T"], "Move before a character on the current line, backwards", ["T"], "Move before a character on the current line, backwards",
function (count, arg) { function (count, arg) {
let pos = editor.findCharBackward(arg, count); let pos = editor.findCharBackward(arg, Math.max(count, 1));
if (pos >= 0) if (pos >= 0)
editor.moveToPosition(pos + 1, false, dactyl.mode == modes.VISUAL); editor.moveToPosition(pos + 1, false, dactyl.mode == modes.VISUAL);
}, },
{ arg: true, count: true }); { arg: true, count: true });
// text edit and visual mode // text edit and visual mode
mappings.add([modes.TEXT_EDIT, modes.VISUAL], mappings.add([modes.TEXT_EDIT, modes.VISUAL],
["~"], "Switch case of the character under the cursor and move the cursor to the right", ["~"], "Switch case of the character under the cursor and move the cursor to the right",
function (count) { function (count) {
if (modes.main == modes.VISUAL) if (modes.main == modes.VISUAL)
count = Editor.getEditor().selectionEnd - Editor.getEditor().selectionStart; count = Editor.getEditor().selectionEnd - Editor.getEditor().selectionStart;
if (typeof count != "number" || count < 1) count = Math.max(count, 1);
count = 1;
// FIXME: do this in one pass?
while (count-- > 0) { while (count-- > 0) {
let text = Editor.getEditor().value; let text = Editor.getEditor().value;
let pos = Editor.getEditor().selectionStart; let pos = Editor.getEditor().selectionStart;