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

Add prettier language servers to LSP logs panel

Browse source
This commit is contained in:
Kirill Bulatov 2023-09-20 13:07:10 +03:00
parent 4b15a2bd63
commit 6cac58b34c
2 changed files with 59 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

68
crates/prettier/src/prettier.rs
View file

@ -4,7 +4,7 @@ use std::sync::Arc;
use anyhow::Context; use anyhow::Context;
use fs::Fs; use fs::Fs;
use gpui::{AsyncAppContext, ModelHandle, Task}; use gpui::{AsyncAppContext, ModelHandle};
use language::language_settings::language_settings; use language::language_settings::language_settings;
use language::{Buffer, BundledFormatter, Diff}; use language::{Buffer, BundledFormatter, Diff};
use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId}; use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId};
@ -147,40 +147,42 @@ impl Prettier {
} }
} }
pub fn start( pub async fn start(
server_id: LanguageServerId,
prettier_dir: PathBuf, prettier_dir: PathBuf,
node: Arc<dyn NodeRuntime>, node: Arc<dyn NodeRuntime>,
cx: AsyncAppContext, cx: AsyncAppContext,
) -> Task<anyhow::Result<Self>> { ) -> anyhow::Result<Self> {
cx.spawn(|cx| async move { let backgroud = cx.background();
anyhow::ensure!( anyhow::ensure!(
prettier_dir.is_dir(), prettier_dir.is_dir(),
"Prettier dir {prettier_dir:?} is not a directory" "Prettier dir {prettier_dir:?} is not a directory"
); );
let prettier_server = DEFAULT_PRETTIER_DIR.join(PRETTIER_SERVER_FILE); let prettier_server = DEFAULT_PRETTIER_DIR.join(PRETTIER_SERVER_FILE);
anyhow::ensure!( anyhow::ensure!(
prettier_server.is_file(), prettier_server.is_file(),
"no prettier server package found at {prettier_server:?}" "no prettier server package found at {prettier_server:?}"
); );
let node_path = node.binary_path().await?; let node_path = backgroud
let server = LanguageServer::new( .spawn(async move { node.binary_path().await })
LanguageServerId(0), .await?;
LanguageServerBinary { let server = LanguageServer::new(
path: node_path, server_id,
arguments: vec![prettier_server.into(), prettier_dir.into()], LanguageServerBinary {
}, path: node_path,
Path::new("/"), arguments: vec![prettier_server.into(), prettier_dir.into()],
None, },
cx, Path::new("/"),
) None,
.context("prettier server creation")?; cx,
let server = server )
.initialize(None) .context("prettier server creation")?;
.await let server = backgroud
.context("prettier server initialization")?; .spawn(server.initialize(None))
Ok(Self { server }) .await
}) .context("prettier server initialization")?;
Ok(Self { server })
} }
pub async fn format( pub async fn format(
@ -228,6 +230,10 @@ impl Prettier {
pub async fn clear_cache(&self) -> anyhow::Result<()> { pub async fn clear_cache(&self) -> anyhow::Result<()> {
todo!() todo!()
} }
pub fn server(&self) -> &Arc<LanguageServer> {
&self.server
}
} }
async fn find_closest_prettier_dir( async fn find_closest_prettier_dir(

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

@ -8283,12 +8283,29 @@ impl Project {
return existing_prettier; return existing_prettier;
} }
let start_task = Prettier::start(prettier_dir.clone(), node, cx.clone()); let task_prettier_dir = prettier_dir.clone();
let weak_project = this.downgrade();
let new_server_id =
this.update(&mut cx, |this, _| this.languages.next_language_server_id());
let new_prettier_task = cx let new_prettier_task = cx
.background() .spawn(|mut cx| async move {
.spawn(async move { let prettier =
Ok(Arc::new(start_task.await.context("starting new prettier")?)) Prettier::start(new_server_id, task_prettier_dir, node, cx.clone())
.map_err(Arc::new) .await
.context("prettier start")
.map_err(Arc::new)?;
if let Some(project) = weak_project.upgrade(&mut cx) {
let prettier_server = Arc::clone(prettier.server());
project.update(&mut cx, |project, cx| {
project.supplementary_language_servers.insert(
new_server_id,
// TODO kb same name repeats for different prettiers, distinguish
(LanguageServerName(Arc::from("prettier")), prettier_server),
);
cx.emit(Event::LanguageServerAdded(new_server_id));
});
}
anyhow::Ok(Arc::new(prettier)).map_err(Arc::new)
}) })
.shared(); .shared();
this.update(&mut cx, |project, _| { this.update(&mut cx, |project, _| {