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

Fix formatting of code in prettier crate (#8526)

Browse source 
Came across this code, saw lots of blue squiggly lines, saw a chance to
simplify the code a little bit and reduce indentation.

(Kinda ironic that I'm the one formatting the prettier code, right?)

Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-02-28 12:51:08 +01:00 • committed by GitHub
parent a3174be565
commit 9f7e625d37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 101 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/project/src/prettier_support.rs
View file

@ -522,6 +522,9 @@ impl Project {
buffer: &Model<Buffer>, buffer: &Model<Buffer>,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Task<Option<(Option<PathBuf>, PrettierTask)>> { ) -> Task<Option<(Option<PathBuf>, PrettierTask)>> {
if !self.is_local() {
return Task::ready(None);
}
let buffer = buffer.read(cx); let buffer = buffer.read(cx);
let buffer_file = buffer.file(); let buffer_file = buffer.file();
let Some(buffer_language) = buffer.language() else { let Some(buffer_language) = buffer.language() else {
@ -530,17 +533,14 @@ impl Project {
if buffer_language.prettier_parser_name().is_none() { if buffer_language.prettier_parser_name().is_none() {
return Task::ready(None); return Task::ready(None);
} }
if self.is_local() {
let Some(node) = self.node.as_ref().map(Arc::clone) else { let Some(node) = self.node.as_ref().map(Arc::clone) else {
return Task::ready(None); return Task::ready(None);
}; };
match File::from_dyn(buffer_file).map(|file| (file.worktree_id(cx), file.abs_path(cx))) match File::from_dyn(buffer_file).map(|file| (file.worktree_id(cx), file.abs_path(cx))) {
{
Some((worktree_id, buffer_path)) => { Some((worktree_id, buffer_path)) => {
let fs = Arc::clone(&self.fs); let fs = Arc::clone(&self.fs);
let installed_prettiers = self.prettier_instances.keys().cloned().collect(); let installed_prettiers = self.prettier_instances.keys().cloned().collect();
return cx.spawn(|project, mut cx| async move { cx.spawn(|project, mut cx| async move {
match cx match cx
.background_executor() .background_executor()
.spawn(async move { .spawn(async move {
@ -553,9 +553,7 @@ impl Project {
}) })
.await .await
{ {
Ok(ControlFlow::Break(())) => { Ok(ControlFlow::Break(())) => None,
return None;
}
Ok(ControlFlow::Continue(None)) => { Ok(ControlFlow::Continue(None)) => {
let default_instance = project let default_instance = project
.update(&mut cx, |project, cx| { .update(&mut cx, |project, cx| {
@ -598,13 +596,8 @@ impl Project {
}) })
.ok()? .ok()?
{ {
log::debug!( log::debug!("Found already started prettier in {prettier_dir:?}");
"Found already started prettier in {prettier_dir:?}" return Some((Some(prettier_dir), prettier_task?.await.log_err()?));
);
return Some((
Some(prettier_dir),
prettier_task?.await.log_err()?,
));
} }
log::info!("Found prettier in {prettier_dir:?}, starting."); log::info!("Found prettier in {prettier_dir:?}, starting.");
@ -630,20 +623,16 @@ impl Project {
} }
Err(e) => { Err(e) => {
log::error!("Failed to determine prettier path for buffer: {e:#}"); log::error!("Failed to determine prettier path for buffer: {e:#}");
return None; None
} }
} }
}); })
} }
None => { None => {
let new_task = self.default_prettier.prettier_task(&node, None, cx); let new_task = self.default_prettier.prettier_task(&node, None, cx);
return cx cx.spawn(|_, _| async move { Some((None, new_task?.log_err().await?)) })
.spawn(|_, _| async move { Some((None, new_task?.log_err().await?)) });
} }
} }
} else {
return Task::ready(None);
}
} }
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]