TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Send updates to the lsp on undo/redo.

Browse source
This commit is contained in:
Blaž Hrastnik 2021-02-15 18:45:36 +09:00
parent b7da7f83c3
commit 1ffd1e7633
2 changed files with 23 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO.md
View file

@ -17,7 +17,7 @@
- [x] retain horiz when moving vertically - [x] retain horiz when moving vertically
- [x] deindent - [x] deindent
- [ ] ensure_cursor_in_view always before rendering? or always in app after event process? - [ ] ensure_cursor_in_view always before rendering? or always in app after event process?
- [ ] update lsp on redo/undo - [x] update lsp on redo/undo
- [ ] Implement marks (superset of Selection/Range) - [ ] Implement marks (superset of Selection/Range)
- [ ] ctrl-v/ctrl-x on file picker - [ ] ctrl-v/ctrl-x on file picker
- [ ] linewise selection work - [ ] linewise selection work

56
helix-view/src/document.rs
View file

@ -160,24 +160,13 @@ impl Document {
self.state.selection = selection; self.state.selection = selection;
} }
pub fn apply(&mut self, transaction: &Transaction) -> bool { pub fn _apply(&mut self, transaction: &Transaction) -> bool {
let old_doc = self.text().clone(); let old_doc = self.text().clone();
// store the state just before any changes are made. This allows us to undo to the
// state just before a transaction was applied.
if self.changes.is_empty() && !transaction.changes().is_empty() {
self.old_state = Some(self.state.clone());
}
let success = transaction.apply(&mut self.state); let success = transaction.apply(&mut self.state);
if !transaction.changes().is_empty() { if !transaction.changes().is_empty() {
// Compose this transaction with the previous one // TODO: self.version += 1;?
take_with(&mut self.changes, |changes| {
changes.compose(transaction.changes().clone())
});
// TODO: when composing, replace transaction.selection too
// update tree-sitter syntax tree // update tree-sitter syntax tree
if let Some(syntax) = &mut self.syntax { if let Some(syntax) = &mut self.syntax {
@ -203,21 +192,28 @@ impl Document {
success success
} }
pub fn apply(&mut self, transaction: &Transaction) -> bool {
// store the state just before any changes are made. This allows us to undo to the
// state just before a transaction was applied.
if self.changes.is_empty() && !transaction.changes().is_empty() {
self.old_state = Some(self.state.clone());
}
let success = self._apply(&transaction);
if !transaction.changes().is_empty() {
// Compose this transaction with the previous one
take_with(&mut self.changes, |changes| {
changes.compose(transaction.changes().clone())
});
}
success
}
pub fn undo(&mut self) -> bool { pub fn undo(&mut self) -> bool {
if let Some(transaction) = self.history.undo() { if let Some(transaction) = self.history.undo() {
let old_doc = self.text().clone();
self.version += 1; self.version += 1;
let success = transaction.apply(&mut self.state); let success = self._apply(&transaction);
// update tree-sitter syntax tree
if let Some(syntax) = &mut self.syntax {
// TODO: no unwrap
syntax
.update(&old_doc, &self.state.doc, transaction.changes())
.unwrap();
}
// TODO: undo / redo need to emit changes to lsp
// reset changeset to fix len // reset changeset to fix len
self.changes = ChangeSet::new(self.text()); self.changes = ChangeSet::new(self.text());
@ -229,17 +225,9 @@ impl Document {
pub fn redo(&mut self) -> bool { pub fn redo(&mut self) -> bool {
if let Some(transaction) = self.history.redo() { if let Some(transaction) = self.history.redo() {
let old_doc = self.text().clone();
self.version += 1; self.version += 1;
let success = transaction.apply(&mut self.state);
// update tree-sitter syntax tree let success = self._apply(&transaction);
if let Some(syntax) = &mut self.syntax {
// TODO: no unwrap
syntax
.update(&old_doc, &self.state.doc, transaction.changes())
.unwrap();
}
// reset changeset to fix len // reset changeset to fix len
self.changes = ChangeSet::new(self.text()); self.changes = ChangeSet::new(self.text());