Integrate pyright language server
This commit is contained in:
parent
c0dbd8f9b9
commit
11f73bfa4e
3 changed files with 104 additions and 3 deletions
|
@ -251,7 +251,7 @@ impl LanguageServer {
|
||||||
let params = InitializeParams {
|
let params = InitializeParams {
|
||||||
process_id: Default::default(),
|
process_id: Default::default(),
|
||||||
root_path: Default::default(),
|
root_path: Default::default(),
|
||||||
root_uri: Some(root_uri),
|
root_uri: Some(root_uri.clone()),
|
||||||
initialization_options: options,
|
initialization_options: options,
|
||||||
capabilities: ClientCapabilities {
|
capabilities: ClientCapabilities {
|
||||||
workspace: Some(WorkspaceClientCapabilities {
|
workspace: Some(WorkspaceClientCapabilities {
|
||||||
|
@ -312,7 +312,10 @@ impl LanguageServer {
|
||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
trace: Default::default(),
|
trace: Default::default(),
|
||||||
workspace_folders: Default::default(),
|
workspace_folders: Some(vec![WorkspaceFolder {
|
||||||
|
uri: root_uri,
|
||||||
|
name: Default::default(),
|
||||||
|
}]),
|
||||||
client_info: Default::default(),
|
client_info: Default::default(),
|
||||||
locale: Default::default(),
|
locale: Default::default(),
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,6 +7,7 @@ mod c;
|
||||||
mod go;
|
mod go;
|
||||||
mod installation;
|
mod installation;
|
||||||
mod json;
|
mod json;
|
||||||
|
mod python;
|
||||||
mod rust;
|
mod rust;
|
||||||
mod typescript;
|
mod typescript;
|
||||||
|
|
||||||
|
@ -46,7 +47,7 @@ pub fn build_language_registry(login_shell_env_loaded: Task<()>) -> LanguageRegi
|
||||||
(
|
(
|
||||||
"python",
|
"python",
|
||||||
tree_sitter_python::language(),
|
tree_sitter_python::language(),
|
||||||
None, //
|
Some(Arc::new(python::PythonLspAdapter)),
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"rust",
|
"rust",
|
||||||
|
|
97
crates/zed/src/languages/python.rs
Normal file
97
crates/zed/src/languages/python.rs
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
use super::installation::{npm_install_packages, npm_package_latest_version};
|
||||||
|
use anyhow::{anyhow, Context, Result};
|
||||||
|
use client::http::HttpClient;
|
||||||
|
use futures::{future::BoxFuture, FutureExt, StreamExt};
|
||||||
|
use language::{LanguageServerName, LspAdapter};
|
||||||
|
use smol::fs;
|
||||||
|
use std::{
|
||||||
|
any::Any,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
sync::Arc,
|
||||||
|
};
|
||||||
|
use util::{ResultExt, TryFutureExt};
|
||||||
|
|
||||||
|
pub struct PythonLspAdapter;
|
||||||
|
|
||||||
|
impl PythonLspAdapter {
|
||||||
|
const BIN_PATH: &'static str = "node_modules/pyright/langserver.index.js";
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LspAdapter for PythonLspAdapter {
|
||||||
|
fn name(&self) -> LanguageServerName {
|
||||||
|
LanguageServerName("pyright".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn server_args(&self) -> &[&str] {
|
||||||
|
&["--stdio"]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fetch_latest_server_version(
|
||||||
|
&self,
|
||||||
|
_: Arc<dyn HttpClient>,
|
||||||
|
) -> BoxFuture<'static, Result<Box<dyn 'static + Any + Send>>> {
|
||||||
|
async move { Ok(Box::new(npm_package_latest_version("pyright").await?) as Box<_>) }.boxed()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fetch_server_binary(
|
||||||
|
&self,
|
||||||
|
version: Box<dyn 'static + Send + Any>,
|
||||||
|
_: Arc<dyn HttpClient>,
|
||||||
|
container_dir: Arc<Path>,
|
||||||
|
) -> BoxFuture<'static, Result<PathBuf>> {
|
||||||
|
let version = version.downcast::<String>().unwrap();
|
||||||
|
async move {
|
||||||
|
let version_dir = container_dir.join(version.as_str());
|
||||||
|
fs::create_dir_all(&version_dir)
|
||||||
|
.await
|
||||||
|
.context("failed to create version directory")?;
|
||||||
|
let binary_path = version_dir.join(Self::BIN_PATH);
|
||||||
|
|
||||||
|
if fs::metadata(&binary_path).await.is_err() {
|
||||||
|
npm_install_packages([("pyright", version.as_str())], &version_dir).await?;
|
||||||
|
|
||||||
|
if let Some(mut entries) = fs::read_dir(&container_dir).await.log_err() {
|
||||||
|
while let Some(entry) = entries.next().await {
|
||||||
|
if let Some(entry) = entry.log_err() {
|
||||||
|
let entry_path = entry.path();
|
||||||
|
if entry_path.as_path() != version_dir {
|
||||||
|
fs::remove_dir_all(&entry_path).await.log_err();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(binary_path)
|
||||||
|
}
|
||||||
|
.boxed()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cached_server_binary(
|
||||||
|
&self,
|
||||||
|
container_dir: Arc<Path>,
|
||||||
|
) -> BoxFuture<'static, Option<PathBuf>> {
|
||||||
|
async move {
|
||||||
|
let mut last_version_dir = None;
|
||||||
|
let mut entries = fs::read_dir(&container_dir).await?;
|
||||||
|
while let Some(entry) = entries.next().await {
|
||||||
|
let entry = entry?;
|
||||||
|
if entry.file_type().await?.is_dir() {
|
||||||
|
last_version_dir = Some(entry.path());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
|
||||||
|
let bin_path = last_version_dir.join(Self::BIN_PATH);
|
||||||
|
if bin_path.exists() {
|
||||||
|
Ok(bin_path)
|
||||||
|
} else {
|
||||||
|
Err(anyhow!(
|
||||||
|
"missing executable in directory {:?}",
|
||||||
|
last_version_dir
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.log_err()
|
||||||
|
.boxed()
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue