suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust LSP changeset generation too: insert now always preceedes delete.

pull/8/head
Blaž Hrastnik 2021-02-16 11:08:06 +09:00
parent b4312c9492
commit 0541fbb85f
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
helix-lsp/src/client.rs
View File

@ -268,7 +268,7 @@ impl Client {
Delete(i) | Retain(i) => *i, Delete(i) | Retain(i) => *i,
Insert(_) => 0, Insert(_) => 0,
}; };
let old_end = old_pos + len; let mut old_end = old_pos + len;
match change { match change {
Retain(_) => {} Retain(_) => {}
@ -276,31 +276,32 @@ impl Client {
let start = pos_to_lsp_pos(&old_text, old_pos); let start = pos_to_lsp_pos(&old_text, old_pos);
let end = pos_to_lsp_pos(&old_text, old_end); let end = pos_to_lsp_pos(&old_text, old_end);
// a subsequent ins means a replace, consume it // deletion
if let Some(Insert(s)) = iter.peek() { changes.push(lsp::TextDocumentContentChangeEvent {
iter.next(); range: Some(lsp::Range::new(start, end)),
text: "".to_string(),
// replacement range_length: None,
changes.push(lsp::TextDocumentContentChangeEvent { });
range: Some(lsp::Range::new(start, end)),
text: s.into(),
range_length: None,
});
} else {
// deletion
changes.push(lsp::TextDocumentContentChangeEvent {
range: Some(lsp::Range::new(start, end)),
text: "".to_string(),
range_length: None,
});
};
} }
Insert(s) => { Insert(s) => {
let start = pos_to_lsp_pos(&old_text, old_pos); let start = pos_to_lsp_pos(&old_text, old_pos);
// insert // a subsequent delete means a replace, consume it
let end = if let Some(Delete(len)) = iter.peek() {
old_end = old_pos + len;
let end = pos_to_lsp_pos(&old_text, old_end);
iter.next();
// replacement
end
} else {
// insert
start
};
changes.push(lsp::TextDocumentContentChangeEvent { changes.push(lsp::TextDocumentContentChangeEvent {
range: Some(lsp::Range::new(start, start)), range: Some(lsp::Range::new(start, end)),
text: s.into(), text: s.into(),
range_length: None, range_length: None,
}); });