From 40570ddc5ba1410c7bf2c38f1b1e8ac6a502fa2f Mon Sep 17 00:00:00 2001
From: Tobias Bertelsen <tobias.bertelsen@gmail.com>
Date: Wed, 6 Dec 2017 22:52:31 +0100
Subject: [PATCH] [sublime keymap] Fixing hotkeys for
addCursorTo(Prev|Next)Line
Fix for issue #5109
---
keymap/sublime.js | 33 ++++-----------------------------
test/sublime_test.js | 25 -------------------------
2 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 37ae6fec..5925b7c5 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -514,27 +514,6 @@
cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
};
- cmds.selectLinesUpward = function(cm) {
- cm.operation(function() {
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (range.head.line > cm.firstLine())
- cm.addSelection(Pos(range.head.line - 1, range.head.ch));
- }
- });
- };
- cmds.selectLinesDownward = function(cm) {
- cm.operation(function() {
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (range.head.line < cm.lastLine())
- cm.addSelection(Pos(range.head.line + 1, range.head.ch));
- }
- });
- };
-
function getTarget(cm) {
var from = cm.getCursor("from"), to = cm.getCursor("to");
if (CodeMirror.cmpPos(from, to) == 0) {
@@ -596,8 +575,6 @@
"Cmd-Enter": "insertLineAfter",
"Shift-Cmd-Enter": "insertLineBefore",
"Cmd-D": "selectNextOccurrence",
- "Shift-Cmd-Up": "addCursorToPrevLine",
- "Shift-Cmd-Down": "addCursorToNextLine",
"Shift-Cmd-Space": "selectScope",
"Shift-Cmd-M": "selectBetweenBrackets",
"Cmd-M": "goToBracket",
@@ -627,8 +604,8 @@
"Cmd-K Cmd-Backspace": "delLineLeft",
"Cmd-K Cmd-0": "unfoldAll",
"Cmd-K Cmd-J": "unfoldAll",
- "Ctrl-Shift-Up": "selectLinesUpward",
- "Ctrl-Shift-Down": "selectLinesDownward",
+ "Ctrl-Shift-Up": "addCursorToPrevLine",
+ "Ctrl-Shift-Down": "addCursorToNextLine",
"Cmd-F3": "findUnder",
"Shift-Cmd-F3": "findUnderPrevious",
"Alt-F3": "findAllUnder",
@@ -658,8 +635,6 @@
"Ctrl-Enter": "insertLineAfter",
"Shift-Ctrl-Enter": "insertLineBefore",
"Ctrl-D": "selectNextOccurrence",
- "Alt-CtrlUp": "addCursorToPrevLine",
- "Alt-CtrlDown": "addCursorToNextLine",
"Shift-Ctrl-Space": "selectScope",
"Shift-Ctrl-M": "selectBetweenBrackets",
"Ctrl-M": "goToBracket",
@@ -689,8 +664,8 @@
"Ctrl-K Ctrl-Backspace": "delLineLeft",
"Ctrl-K Ctrl-0": "unfoldAll",
"Ctrl-K Ctrl-J": "unfoldAll",
- "Ctrl-Alt-Up": "selectLinesUpward",
- "Ctrl-Alt-Down": "selectLinesDownward",
+ "Ctrl-Alt-Up": "addCursorToPrevLine",
+ "Ctrl-Alt-Down": "addCursorToNextLine",
"Ctrl-F3": "findUnder",
"Shift-Ctrl-F3": "findUnderPrevious",
"Alt-F3": "findAllUnder",
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 27132d16..09bb9512 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -221,31 +221,6 @@
2, 4, 2, 6,
2, 7, 2, 7));
- stTest("selectLinesUpward", "123\n345\n789\n012",
- setSel(0, 1, 0, 1,
- 1, 1, 1, 3,
- 2, 0, 2, 0,
- 3, 0, 3, 0),
- "selectLinesUpward",
- hasSel(0, 1, 0, 1,
- 0, 3, 0, 3,
- 1, 0, 1, 0,
- 1, 1, 1, 3,
- 2, 0, 2, 0,
- 3, 0, 3, 0));
-
- stTest("selectLinesDownward", "123\n345\n789\n012",
- setSel(0, 1, 0, 1,
- 1, 1, 1, 3,
- 2, 0, 2, 0,
- 3, 0, 3, 0),
- "selectLinesDownward",
- hasSel(0, 1, 0, 1,
- 1, 1, 1, 3,
- 2, 0, 2, 0,
- 2, 3, 2, 3,
- 3, 0, 3, 0));
-
stTest("sortLines", "c\nb\na\nC\nB\nA",
"sortLines", val("A\nB\nC\na\nb\nc"),
"undo",
--
GitLab