fix regression in stripws

This commit is contained in:
nightwing 2016-03-30 19:31:23 +04:00
parent ea4f64e0c7
commit 23cbb33833
2 changed files with 13 additions and 2 deletions

View File

@ -131,7 +131,7 @@ exports.trimTrailingSpace = function(session, options) {
if (options && options.keepCursorPosition) {
if (session.selection.rangeCount) {
session.selection.rangeList.ranges.forEach(function(x, i, ranges) {
var next = ranges[i + 1]
var next = ranges[i + 1];
if (next && next.cursor.row == x.cursor.row)
return;
cursors.push(x.cursor);
@ -148,7 +148,7 @@ exports.trimTrailingSpace = function(session, options) {
var index = line.search(/\s+$/);
if (i == cursorRow) {
if (index < cursors[ci].column)
if (index < cursors[ci].column && index > min)
index = cursors[ci].column;
ci++;
cursorRow = cursors[ci] ? cursors[ci].row : -1;

View File

@ -183,6 +183,17 @@ module.exports = {
trimEmpty: true,
keepCursorPosition: true
});
session.setValue("some text");
session.selection.fromJSON([{
start: {row:0,column:4},
end: {row:0,column:4}
}]);
testOne("some text", {
keepCursorPosition: true,
trimEmpty: true
});
next();
},
};