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

Resolve prettier config before every formatting

Browse source
This commit is contained in:
Kirill Bulatov 2023-09-23 00:39:46 +03:00
parent 658b58378e
commit a9f80a603c
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4130,9 +4130,12 @@ impl Project {
.await
{
Ok(prettier) => {
let buffer_path = buffer.read_with(&cx, |buffer, cx| {
File::from_dyn(buffer.file()).map(|file| file.abs_path(cx))
});
format_operation = Some(FormatOperation::Prettier(
prettier
.format(buffer, &cx)
.format(buffer, buffer_path, &cx)
.await
.context("formatting via prettier")?,
));
@ -4168,9 +4171,12 @@ impl Project {
.await
{
Ok(prettier) => {
let buffer_path = buffer.read_with(&cx, |buffer, cx| {
File::from_dyn(buffer.file()).map(|file| file.abs_path(cx))
});
format_operation = Some(FormatOperation::Prettier(
prettier
.format(buffer, &cx)
.format(buffer, buffer_path, &cx)
.await
.context("formatting via prettier")?,
));
@ -8309,7 +8315,6 @@ impl Project {
let task = cx.spawn(|this, mut cx| async move {
let fs = this.update(&mut cx, |project, _| Arc::clone(&project.fs));
// TODO kb can we have a cache for this instead?
let prettier_dir = match cx
.background()
.spawn(Prettier::locate(