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

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2023-10-23 16:39:30 +02:00
parent 7832120a4c
commit 21d4546a86
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/project2/src/project2.rs
View file

@ -587,7 +587,7 @@ impl Project {
client.add_model_request_handler(Self::handle_rename_project_entry); client.add_model_request_handler(Self::handle_rename_project_entry);
client.add_model_request_handler(Self::handle_copy_project_entry); client.add_model_request_handler(Self::handle_copy_project_entry);
client.add_model_request_handler(Self::handle_delete_project_entry); client.add_model_request_handler(Self::handle_delete_project_entry);
client. m.,add_model_request_handler(Self::handle_expand_project_entry); client.add_model_request_handler(Self::handle_expand_project_entry);
client.add_model_request_handler(Self::handle_apply_additional_edits_for_completion); client.add_model_request_handler(Self::handle_apply_additional_edits_for_completion);
client.add_model_request_handler(Self::handle_apply_code_action); client.add_model_request_handler(Self::handle_apply_code_action);
client.add_model_request_handler(Self::handle_on_type_formatting); client.add_model_request_handler(Self::handle_on_type_formatting);
@ -8414,8 +8414,8 @@ impl Project {
let task_prettier_dir = prettier_dir.clone(); let task_prettier_dir = prettier_dir.clone();
let new_prettier_task = cx let new_prettier_task = cx
.spawn(|mut cx| async move { .spawn(|mut cx| async move {
let new_server_id = let new_server_id = this
this.update(&mut cx, |this, _| this.languages.next_language_server_id())?; .update(&mut cx, |this, _| this.languages.next_language_server_id())?;
let prettier = Prettier::start( let prettier = Prettier::start(
worktree_id.map(|id| id.to_usize()), worktree_id.map(|id| id.to_usize()),
new_server_id, new_server_id,
@ -8428,9 +8428,7 @@ impl Project {
.map_err(Arc::new)?; .map_err(Arc::new)?;
log::info!("Started prettier in {:?}", prettier.prettier_dir()); log::info!("Started prettier in {:?}", prettier.prettier_dir());
if let Some(prettier_server) = if let Some(prettier_server) = prettier.server() {
prettier.server()
{
this.update(&mut cx, |project, cx| { this.update(&mut cx, |project, cx| {
let name = if prettier.is_default() { let name = if prettier.is_default() {
LanguageServerName(Arc::from("prettier (default)")) LanguageServerName(Arc::from("prettier (default)"))