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

LSP: Update doc paths renamed by TextDocumentEdit #8924

Closed
wants to merge 1 commit into from
Closed

LSP: Update doc paths renamed by TextDocumentEdit #8924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions helix-term/src/commands/lsp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,10 @@ pub fn execute_lsp_command(editor: &mut Editor, language_server_id: usize, cmd:
});
}

pub fn apply_document_resource_op(op: &lsp::ResourceOp) -> std::io::Result<()> {
pub fn apply_document_resource_op(
editor: &mut Editor,
op: &lsp::ResourceOp,
) -> std::io::Result<()> {
use lsp::ResourceOp;
use std::fs;
match op {
Expand Down Expand Up @@ -833,7 +836,14 @@ pub fn apply_document_resource_op(op: &lsp::ResourceOp) -> std::io::Result<()> {
if ignore_if_exists && to.exists() {
Ok(())
} else {
fs::rename(from, &to)
fs::rename(&from, &to)?;

// If this file is open, update the Document's path.
if let Some(doc) = editor.document_by_path_mut(from) {
doc.set_path(Some(&to));
}

Ok(())
}
}
}
Expand Down Expand Up @@ -872,9 +882,10 @@ pub fn apply_workspace_edit(
offset_encoding: OffsetEncoding,
workspace_edit: &lsp::WorkspaceEdit,
) -> Result<(), ApplyEditError> {
let mut apply_edits = |uri: &helix_lsp::Url,
version: Option<i32>,
text_edits: Vec<lsp::TextEdit>|
let apply_edits = |editor: &mut Editor,
uri: &helix_lsp::Url,
version: Option<i32>,
text_edits: Vec<lsp::TextEdit>|
-> Result<(), ApplyEditErrorKind> {
let path = match uri.to_file_path() {
Ok(path) => path,
Expand Down Expand Up @@ -948,6 +959,7 @@ pub fn apply_workspace_edit(
.cloned()
.collect();
apply_edits(
editor,
&document_edit.text_document.uri,
document_edit.text_document.version,
edits,
Expand All @@ -963,9 +975,11 @@ pub fn apply_workspace_edit(
for (i, operation) in operations.iter().enumerate() {
match operation {
lsp::DocumentChangeOperation::Op(op) => {
apply_document_resource_op(op).map_err(|io| ApplyEditError {
kind: ApplyEditErrorKind::IoError(io),
failed_change_idx: i,
apply_document_resource_op(editor, op).map_err(|io| {
ApplyEditError {
kind: ApplyEditErrorKind::IoError(io),
failed_change_idx: i,
}
})?;
}

Expand All @@ -982,6 +996,7 @@ pub fn apply_workspace_edit(
.cloned()
.collect();
apply_edits(
editor,
&document_edit.text_document.uri,
document_edit.text_document.version,
edits,
Expand All @@ -1003,7 +1018,7 @@ pub fn apply_workspace_edit(
log::debug!("workspace changes: {:?}", changes);
for (i, (uri, text_edits)) in changes.iter().enumerate() {
let text_edits = text_edits.to_vec();
apply_edits(uri, None, text_edits).map_err(|kind| ApplyEditError {
apply_edits(editor, uri, None, text_edits).map_err(|kind| ApplyEditError {
kind,
failed_change_idx: i,
})?;
Expand Down
Loading