zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-09 21:26:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Always write prettier server file

Browse Source
This commit is contained in:
Kirill Bulatov 2023-11-28 16:31:24 +02:00
parent eab3476304
commit 938f2531c4
1 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
crates/project/src/prettier_support.rs
View File

@ -193,51 +193,53 @@ fn start_default_prettier(
) -> Task<anyhow::Result<PrettierTask>> { ) -> Task<anyhow::Result<PrettierTask>> {
cx.spawn(|project, mut cx| async move { cx.spawn(|project, mut cx| async move {
loop { loop {
let mut install_attempt = 0;
let installation_process = project.update(&mut cx, |project, _| { let installation_process = project.update(&mut cx, |project, _| {
match &project.default_prettier.prettier { match &project.default_prettier.prettier {
PrettierInstallation::NotInstalled { PrettierInstallation::NotInstalled {
installation_process, installation_process,
attempts ..
} => { } => ControlFlow::Continue(installation_process.clone()),
install_attempt = *attempts;
ControlFlow::Continue(installation_process.clone())},
PrettierInstallation::Installed(default_prettier) => { PrettierInstallation::Installed(default_prettier) => {
ControlFlow::Break(default_prettier.clone()) ControlFlow::Break(default_prettier.clone())
} }
} }
}); });
install_attempt += 1;
match installation_process { match installation_process {
ControlFlow::Continue(installation_process) => { ControlFlow::Continue(None) => {
if let Some(installation_process) = installation_process.clone() { anyhow::bail!("Default prettier is not installed and cannot be started")
if let Err(e) = installation_process.await { }
anyhow::bail!("Cannot start default prettier due to its installation failure: {e:#}"); ControlFlow::Continue(Some(installation_process)) => {
} if let Err(e) = installation_process.await {
anyhow::bail!(
"Cannot start default prettier due to its installation failure: {e:#}"
);
} }
let new_default_prettier = project.update(&mut cx, |project, cx| { let new_default_prettier = project.update(&mut cx, |project, cx| {
let new_default_prettier = let new_default_prettier =
start_prettier(node, DEFAULT_PRETTIER_DIR.clone(), worktree_id, cx); start_prettier(node, DEFAULT_PRETTIER_DIR.clone(), worktree_id, cx);
project.default_prettier.prettier = project.default_prettier.prettier =
PrettierInstallation::Installed(PrettierInstance { attempt: install_attempt, prettier: Some(new_default_prettier.clone()) }); PrettierInstallation::Installed(PrettierInstance {
attempt: 0,
prettier: Some(new_default_prettier.clone()),
});
new_default_prettier new_default_prettier
}); });
return Ok(new_default_prettier); return Ok(new_default_prettier);
} }
ControlFlow::Break(instance) => { ControlFlow::Break(instance) => match instance.prettier {
match instance.prettier { Some(instance) => return Ok(instance),
Some(instance) => return Ok(instance), None => {
None => { let new_default_prettier = project.update(&mut cx, |project, cx| {
let new_default_prettier = project.update(&mut cx, |project, cx| { let new_default_prettier =
let new_default_prettier = start_prettier(node, DEFAULT_PRETTIER_DIR.clone(), worktree_id, cx);
start_prettier(node, DEFAULT_PRETTIER_DIR.clone(), worktree_id, cx); project.default_prettier.prettier =
project.default_prettier.prettier = PrettierInstallation::Installed(PrettierInstance {
PrettierInstallation::Installed(PrettierInstance { attempt: instance.attempt + 1, prettier: Some(new_default_prettier.clone()) }); attempt: instance.attempt + 1,
new_default_prettier prettier: Some(new_default_prettier.clone()),
}); });
return Ok(new_default_prettier); new_default_prettier
}, });
return Ok(new_default_prettier);
} }
}, },
} }
@ -322,21 +324,6 @@ async fn install_default_prettier(
node: Arc<dyn NodeRuntime>, node: Arc<dyn NodeRuntime>,
fs: Arc<dyn Fs>, fs: Arc<dyn Fs>,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let prettier_wrapper_path = DEFAULT_PRETTIER_DIR.join(prettier::PRETTIER_SERVER_FILE);
// method creates parent directory if it doesn't exist
fs.save(
&prettier_wrapper_path,
&text::Rope::from(prettier::PRETTIER_SERVER_JS),
text::LineEnding::Unix,
)
.await
.with_context(|| {
format!(
"writing {} file at {prettier_wrapper_path:?}",
prettier::PRETTIER_SERVER_FILE
)
})?;
let packages_to_versions = let packages_to_versions =
future::try_join_all(plugins_to_install.iter().chain(Some(&"prettier")).map( future::try_join_all(plugins_to_install.iter().chain(Some(&"prettier")).map(
|package_name| async { |package_name| async {
@ -364,6 +351,23 @@ async fn install_default_prettier(
anyhow::Ok(()) anyhow::Ok(())
} }
async fn save_prettier_server_file(fs: &dyn Fs) -> Result<(), anyhow::Error> {
let prettier_wrapper_path = DEFAULT_PRETTIER_DIR.join(prettier::PRETTIER_SERVER_FILE);
fs.save(
&prettier_wrapper_path,
&text::Rope::from(prettier::PRETTIER_SERVER_JS),
text::LineEnding::Unix,
)
.await
.with_context(|| {
format!(
"writing {} file at {prettier_wrapper_path:?}",
prettier::PRETTIER_SERVER_FILE
)
})?;
Ok(())
}
impl Project { impl Project {
pub fn update_prettier_settings( pub fn update_prettier_settings(
&self, &self,
@ -662,7 +666,10 @@ impl Project {
.map_err(Arc::new)? .map_err(Arc::new)?
{ {
ControlFlow::Break(()) => return Ok(()), ControlFlow::Break(()) => return Ok(()),
ControlFlow::Continue(Some(_non_default_prettier)) => return Ok(()), ControlFlow::Continue(Some(_non_default_prettier)) => {
save_prettier_server_file(fs.as_ref()).await?;
return Ok(());
}
ControlFlow::Continue(None) => { ControlFlow::Continue(None) => {
let mut needs_install = match previous_installation_process { let mut needs_install = match previous_installation_process {
Some(previous_installation_process) => { Some(previous_installation_process) => {
@ -681,6 +688,7 @@ impl Project {
cx.background() cx.background()
// TODO kb instead of always installing, try to start the existing installation first? // TODO kb instead of always installing, try to start the existing installation first?
.spawn(async move { .spawn(async move {
save_prettier_server_file(fs.as_ref()).await?;
install_default_prettier(plugins_to_install, node, fs).await install_default_prettier(plugins_to_install, node, fs).await
}) })
.await .await