Merge pull request #1763 from mcorlan/master

redmunds · redmunds · commit 5eddb2a3a666 · 2012-10-12T08:12:49.000-07:00
Adding support for delete entire line/lines
diff --git a/src/command/Commands.js b/src/command/Commands.js
@@ -62,6 +62,7 @@ define(function (require, exports, module) {
     exports.EDIT_INDENT                 = "edit.indent";
     exports.EDIT_UNINDENT               = "edit.unindent";
     exports.EDIT_DUPLICATE              = "edit.duplicate";
+    exports.EDIT_DELETE_LINES           = "edit.deletelines";
     exports.EDIT_LINE_COMMENT           = "edit.lineComment";
     exports.EDIT_LINE_UP                = "edit.lineUp";
     exports.EDIT_LINE_DOWN              = "edit.lineDown";
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -882,6 +882,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.EDIT_INDENT,          [{key: "Indent", displayKey: "Tab"}]);
         menu.addMenuItem(Commands.EDIT_UNINDENT,        [{key: "Unindent", displayKey: "Shift-Tab"}]);
         menu.addMenuItem(Commands.EDIT_DUPLICATE,       "Ctrl-D");
+        menu.addMenuItem(Commands.EDIT_DELETE_LINES,    "Ctrl-Shift-D");
         menu.addMenuItem(Commands.EDIT_LINE_UP,         [{key: "Ctrl-Shift-Up", displayKey: "Ctrl-Shift-\u2191",
                                                           platform: "win"},
                                                          {key:  "Cmd-Ctrl-Up", displayKey: "Cmd-Ctrl-\u2191",
diff --git a/src/editor/EditorCommandHandlers.js b/src/editor/EditorCommandHandlers.js
@@ -159,6 +159,30 @@ define(function (require, exports, module) {
         var selectedText = doc.getRange(sel.start, sel.end) + delimiter;
         doc.replaceRange(selectedText, sel.start);
     }
+
+    /**
+     * Deletes the current line if there is no selection or the lines for the selection
+     * (removing the end of line too)
+     */
+    function deleteCurrentLines(editor) {
+        editor = editor || EditorManager.getFocusedEditor();
+        if (!editor) {
+            return;
+        }
+
+        var from, to, sel, doc;
+
+        doc = editor._codeMirror;
+        sel = doc.getCursor(true);
+        from = {line: sel.line, ch: 0};
+        sel = doc.getCursor(false);
+        to = {line: sel.line + 1, ch: 0};
+        if (doc.lineCount() === to.line && from.line > 0) {
+            from.line -= 1;
+            from.ch = doc.getLine(from.line).length;
+        }
+        doc.replaceRange("", from, to);
+    }
     
     /**
      * Moves the selected text, or current line if no selection. The cursor/selection 
@@ -278,6 +302,7 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_UNINDENT,       Commands.EDIT_UNINDENT,         unidentText);
     CommandManager.register(Strings.CMD_COMMENT,        Commands.EDIT_LINE_COMMENT,     lineComment);
     CommandManager.register(Strings.CMD_DUPLICATE,      Commands.EDIT_DUPLICATE,        duplicateText);
+    CommandManager.register(Strings.CMD_DELETE_LINES,   Commands.EDIT_DELETE_LINES,     deleteCurrentLines);
     CommandManager.register(Strings.CMD_LINE_UP,        Commands.EDIT_LINE_UP,          moveLineUp);
     CommandManager.register(Strings.CMD_LINE_DOWN,      Commands.EDIT_LINE_DOWN,        moveLineDown);
     CommandManager.register(Strings.CMD_USE_TAB_CHARS,  Commands.TOGGLE_USE_TAB_CHARS,  toggleUseTabChars)
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
@@ -179,6 +179,7 @@ define({
     "CMD_INDENT"                          : "Indent",
     "CMD_UNINDENT"                        : "Unindent",
     "CMD_DUPLICATE"                       : "Duplicate",
+    "CMD_DELETE_LINES"                    : "Delete Selected Line(s)",
     "CMD_COMMENT"                         : "Comment/Uncomment Lines",
     "CMD_LINE_UP"                         : "Move Line(s) Up",
     "CMD_LINE_DOWN"                       : "Move Line(s) Down",
