livebook-dev/livebook
1
1
Fork 0
mirror of https://github.com/livebook-dev/livebook.git synced 2025-09-04 03:54:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge undo stack for collaborative editing (#433)

Browse source
This commit is contained in:
Jonatan Kłosko 2021-07-05 14:44:00 +02:00 • committed by GitHub
parent 0c9e25d1be
commit 6d9fb90953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
assets/js/cell/live_editor/monaco_editor_adapter.js
View file

@ -10,11 +10,15 @@ export default class MonacoEditorAdapter {
constructor(editor) {
this.editor = editor;
this._onDelta = null;
this.isLastChangeRemote = false;
this.editor.onDidChangeModelContent((event) => {
if (this.ignoreChange) {
return;
}
this.isLastChangeRemote = false;
const delta = this.__deltaFromEditorChange(event);
this._onDelta && this._onDelta(delta);
});
@ -32,19 +36,38 @@ export default class MonacoEditorAdapter {
* Applies the given delta to the editor content.
*/
applyDelta(delta) {
const isStandaloneChange = delta.ops.some((op) => {
if (isDelete(op)) {
return true;
}
if (isInsert(op)) {
return op.insert.match(/\s+/);
}
return false;
});
// Explicitly close the last stack element when the remote
// change inserts whitespace or deletes text. Otherwise
// merge subsequent remote changes whenever possible.
if (isStandaloneChange || !this.isLastChangeRemote) {
this.editor.getModel().pushStackElement();
} else {
this.editor.getModel().popStackElement();
}
const operations = this.__deltaToEditorOperations(delta);
this.ignoreChange = true;
// Apply the operations without adding them to the undo stack
this.editor.getModel().applyEdits(operations);
// Apply the operations and add them to the undo stack
this.editor.getModel().pushEditOperations(null, operations, null);
// Close the stack element upfront in case the next
// change is local. If another remote change comes,
// we open the element back using `popStackElement`.
this.editor.getModel().pushStackElement();
this.ignoreChange = false;
// Clear the undo/redo stack as the operations may no longer be valid
// after applying the concurrent change.
// Note: there's not public method for getting EditStack for the text model,
// so we use the private attribute.
// (https://github.com/microsoft/vscode/blob/11ac71b27220a2354b6bb28966ed3ead183cc495/src/vs/editor/common/model/textModel.ts#L287)
const editStack = this.editor.getModel()._commandManager;
editStack.clear();
this.isLastChangeRemote = true;
}
__deltaFromEditorChange(event) {