Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Multicursor backspacing #7401

Merged
merged 5 commits into from Oct 25, 2019
Merged

Fixed Multicursor backspacing #7401

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63971a2
Fixed multicursor backspacing
benthayer Sep 13, 2019
1d5eb4b
Fixed build errors
benthayer Oct 22, 2019
3bdc097
Changed variable for clarity
benthayer Oct 22, 2019
a56a093
Fixed backspacing newlines
benthayer Oct 22, 2019
ec6c3f1
Changed var to let and == to === and != to !==
benthayer Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 31 additions & 24 deletions packages/codemirror/src/editor.ts
View file
Open in desktop
Expand Up @@ -1361,31 +1361,38 @@ namespace Private {
*/
export function delSpaceToPrevTabStop(cm: CodeMirror.Editor): void {
let doc = cm.getDoc();
let from = doc.getCursor('from');
let to = doc.getCursor('to');
let sel = !posEq(from, to);
if (sel) {
let ranges = doc.listSelections();
for (let i = ranges.length - 1; i >= 0; i--) {
let head = ranges[i].head;
let anchor = ranges[i].anchor;
doc.replaceRange(
'',
CodeMirror.Pos(head.line, head.ch),
CodeMirror.Pos(anchor.line, anchor.ch)
);
let tabSize = cm.getOption('indentUnit');
let ranges = doc.listSelections(); // handle multicursor
for (let i = ranges.length - 1; i >= 0; i--) {
// iterate reverse so any deletions don't overlap
let head = ranges[i].head;
let anchor = ranges[i].anchor;
let isSelection = !posEq(head, anchor);
if (isSelection) {
doc.replaceRange('', anchor, head);
} else {
let line = doc.getLine(head.line).substring(0, head.ch);
if (line.match(/^\ +$/) !== null) {
// delete tabs
let prevTabStop = (Math.ceil(head.ch / tabSize) - 1) * tabSize;
let from = CodeMirror.Pos(head.line, prevTabStop);
doc.replaceRange('', from, head);
} else {
// delete non-tabs
if (head.ch === 0) {
if (head.line !== 0) {
let from = CodeMirror.Pos(
head.line - 1,
doc.getLine(head.line - 1).length
);
doc.replaceRange('', from, head);
}
} else {
let from = CodeMirror.Pos(head.line, head.ch - 1);
doc.replaceRange('', from, head);
}
}
}
return;
}
let cur = doc.getCursor();
let tabsize = cm.getOption('indentUnit');
let chToPrevTabStop = cur.ch - (Math.ceil(cur.ch / tabsize) - 1) * tabsize;
from = { ch: cur.ch - chToPrevTabStop, line: cur.line };
let select = doc.getRange(from, cur);
if (select.match(/^\ +$/) !== null) {
doc.replaceRange('', from, cur);
} else {
CodeMirror.commands['delCharBefore'](cm);
}
}

Expand Down