Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run code action's commands if their edits are empty

Browse source
This commit is contained in:
Max Brunsfeld 2022-07-08 16:12:20 -07:00
parent 4ec2d6e50d
commit e101f4e705
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/project/src/project.rs
View file

@ -3710,7 +3710,8 @@ impl Project {
} }
if let Some(edit) = action.lsp_action.edit { if let Some(edit) = action.lsp_action.edit {
Self::deserialize_workspace_edit( if edit.changes.is_some() || edit.document_changes.is_some() {
return Self::deserialize_workspace_edit(
this, this,
edit, edit,
push_to_history, push_to_history,
@ -3718,8 +3719,11 @@ impl Project {
lang_server.clone(), lang_server.clone(),
&mut cx, &mut cx,
) )
.await .await;
} else if let Some(command) = action.lsp_action.command { }
}
if let Some(command) = action.lsp_action.command {
this.update(&mut cx, |this, _| { this.update(&mut cx, |this, _| {
this.last_workspace_edits_by_language_server this.last_workspace_edits_by_language_server
.remove(&lang_server.server_id()); .remove(&lang_server.server_id());
@ -3731,14 +3735,14 @@ impl Project {
..Default::default() ..Default::default()
}) })
.await?; .await?;
Ok(this.update(&mut cx, |this, _| { return Ok(this.update(&mut cx, |this, _| {
this.last_workspace_edits_by_language_server this.last_workspace_edits_by_language_server
.remove(&lang_server.server_id()) .remove(&lang_server.server_id())
.unwrap_or_default() .unwrap_or_default()
})) }));
} else {
Ok(ProjectTransaction::default())
} }
Ok(ProjectTransaction::default())
}) })
} else if let Some(project_id) = self.remote_id() { } else if let Some(project_id) = self.remote_id() {
let client = self.client.clone(); let client = self.client.clone();