Add ability to specify binary path/args for rust-analyzer (#9293)
This fixes #9292 by adding a section to the language server settings that allows users to specify the binary path and arguments with which to start up a language server. Example user settings for `rust-analyzer`: ```json { "lsp": { "rust-analyzer": { "binary": { "path": "/Users/thorstenball/tmp/rust-analyzer-aarch64-apple-darwin", "arguments": ["--no-log-buffering"] } } } } ``` Constraints: * Right now this only allows ABSOLUTE paths. * This is only used by `rust-analyzer` integration right now, but the setting can be used for other language servers. We just need to update the adapters to also respect that setting. Release Notes: - Added ability to specify `rust-analyzer` binary `path` (must be absolute) and `arguments` in user settings. Example: `{"lsp": {"rust-analyzer": {"binary": {"path": "/my/abs/path/rust-analyzer", "arguments": ["--no-log-buffering"] }}}}` ([#9292](https://github.com/zed-industries/zed/issues/9292)). Co-authored-by: Ricard Mallafre <rikitzzz@gmail.com>
This commit is contained in:
parent
6655b964ab
commit
a56a260778
38 changed files with 92 additions and 43 deletions
|
@ -30,7 +30,7 @@ impl AstroLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for AstroLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("astro-language-server".into())
|
||||
|
|
|
@ -14,7 +14,7 @@ use util::{
|
|||
|
||||
pub struct CLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl super::LspAdapter for CLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("clangd".into())
|
||||
|
|
|
@ -12,7 +12,7 @@ use util::{
|
|||
#[derive(Copy, Clone)]
|
||||
pub struct ClojureLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl super::LspAdapter for ClojureLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("clojure-lsp".into())
|
||||
|
|
|
@ -15,7 +15,7 @@ use util::{github::GitHubLspBinaryVersion, ResultExt};
|
|||
|
||||
pub struct OmniSharpAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl super::LspAdapter for OmniSharpAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("OmniSharp".into())
|
||||
|
|
|
@ -31,7 +31,7 @@ impl CssLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for CssLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("vscode-css-language-server".into())
|
||||
|
|
|
@ -13,7 +13,7 @@ use std::{
|
|||
|
||||
pub struct DartLanguageServer;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for DartLanguageServer {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("dart".into())
|
||||
|
|
|
@ -56,7 +56,7 @@ impl DenoLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for DenoLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("deno-language-server".into())
|
||||
|
|
|
@ -29,7 +29,7 @@ impl DockerfileLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for DockerfileLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("docker-langserver".into())
|
||||
|
|
|
@ -65,7 +65,7 @@ impl Settings for ElixirSettings {
|
|||
|
||||
pub struct ElixirLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for ElixirLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("elixir-ls".into())
|
||||
|
@ -292,7 +292,7 @@ async fn get_cached_server_binary_elixir_ls(
|
|||
|
||||
pub struct NextLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for NextLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("next-ls".into())
|
||||
|
@ -446,7 +446,7 @@ pub struct LocalLspAdapter {
|
|||
pub arguments: Vec<String>,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for LocalLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("local-ls".into())
|
||||
|
|
|
@ -34,7 +34,7 @@ impl ElmLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for ElmLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName(SERVER_NAME.into())
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{any::Any, path::PathBuf};
|
|||
|
||||
pub struct ErlangLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for ErlangLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("erlang_ls".into())
|
||||
|
|
|
@ -21,7 +21,7 @@ fn server_binary_arguments() -> Vec<OsString> {
|
|||
|
||||
pub struct GleamLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for GleamLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("gleam".into())
|
||||
|
|
|
@ -32,7 +32,7 @@ lazy_static! {
|
|||
static ref GOPLS_VERSION_REGEX: Regex = Regex::new(r"\d+\.\d+\.\d+").unwrap();
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl super::LspAdapter for GoLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("gopls".into())
|
||||
|
@ -57,6 +57,7 @@ impl super::LspAdapter for GoLspAdapter {
|
|||
async fn check_if_user_installed(
|
||||
&self,
|
||||
delegate: &dyn LspAdapterDelegate,
|
||||
_: &AsyncAppContext,
|
||||
) -> Option<LanguageServerBinary> {
|
||||
let env = delegate.shell_env().await;
|
||||
let path = delegate.which("gopls".as_ref()).await?;
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{any::Any, path::PathBuf};
|
|||
|
||||
pub struct HaskellLanguageServer;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for HaskellLanguageServer {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("hls".into())
|
||||
|
|
|
@ -31,7 +31,7 @@ impl HtmlLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for HtmlLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("vscode-html-language-server".into())
|
||||
|
|
|
@ -83,7 +83,7 @@ impl JsonLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for JsonLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("json-language-server".into())
|
||||
|
|
|
@ -16,7 +16,7 @@ use util::{
|
|||
#[derive(Copy, Clone)]
|
||||
pub struct LuaLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl super::LspAdapter for LuaLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("lua-language-server".into())
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{any::Any, path::PathBuf};
|
|||
|
||||
pub struct NuLanguageServer;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for NuLanguageServer {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("nu".into())
|
||||
|
|
|
@ -12,7 +12,7 @@ const OPERATOR_CHAR: [char; 17] = [
|
|||
|
||||
pub struct OCamlLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for OCamlLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("ocamllsp".into())
|
||||
|
|
|
@ -34,7 +34,7 @@ impl IntelephenseLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for IntelephenseLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("intelephense".into())
|
||||
|
|
|
@ -29,7 +29,7 @@ impl PrismaLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for PrismaLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("prisma-language-server".into())
|
||||
|
|
|
@ -33,7 +33,7 @@ impl PurescriptLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for PurescriptLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("purescript-language-server".into())
|
||||
|
|
|
@ -28,7 +28,7 @@ impl PythonLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for PythonLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("pyright".into())
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{any::Any, path::PathBuf, sync::Arc};
|
|||
|
||||
pub struct RubyLanguageServer;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for RubyLanguageServer {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("solargraph".into())
|
||||
|
|
|
@ -2,12 +2,15 @@ use anyhow::{anyhow, bail, Result};
|
|||
use async_compression::futures::bufread::GzipDecoder;
|
||||
use async_trait::async_trait;
|
||||
use futures::{io::BufReader, StreamExt};
|
||||
use gpui::AsyncAppContext;
|
||||
pub use language::*;
|
||||
use lazy_static::lazy_static;
|
||||
use lsp::LanguageServerBinary;
|
||||
use project::project_settings::ProjectSettings;
|
||||
use regex::Regex;
|
||||
use settings::Settings;
|
||||
use smol::fs::{self, File};
|
||||
use std::{any::Any, borrow::Cow, env::consts, path::PathBuf, str, sync::Arc};
|
||||
use std::{any::Any, borrow::Cow, env::consts, path::PathBuf, sync::Arc};
|
||||
use util::{
|
||||
async_maybe,
|
||||
fs::remove_matching,
|
||||
|
@ -17,10 +20,41 @@ use util::{
|
|||
|
||||
pub struct RustLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
impl RustLspAdapter {
|
||||
const SERVER_NAME: &'static str = "rust-analyzer";
|
||||
}
|
||||
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for RustLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("rust-analyzer".into())
|
||||
LanguageServerName(Self::SERVER_NAME.into())
|
||||
}
|
||||
|
||||
async fn check_if_user_installed(
|
||||
&self,
|
||||
_delegate: &dyn LspAdapterDelegate,
|
||||
cx: &AsyncAppContext,
|
||||
) -> Option<LanguageServerBinary> {
|
||||
let binary = cx
|
||||
.update(|cx| {
|
||||
ProjectSettings::get_global(cx)
|
||||
.lsp
|
||||
.get(Self::SERVER_NAME)
|
||||
.and_then(|s| s.binary.clone())
|
||||
})
|
||||
.ok()??;
|
||||
|
||||
let path = binary.path?;
|
||||
Some(LanguageServerBinary {
|
||||
path: path.into(),
|
||||
arguments: binary
|
||||
.arguments
|
||||
.unwrap_or_default()
|
||||
.iter()
|
||||
.map(|arg| arg.into())
|
||||
.collect(),
|
||||
env: None,
|
||||
})
|
||||
}
|
||||
|
||||
async fn fetch_latest_server_version(
|
||||
|
|
|
@ -30,7 +30,7 @@ impl SvelteLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for SvelteLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("svelte-language-server".into())
|
||||
|
|
|
@ -32,7 +32,7 @@ impl TailwindLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for TailwindLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("tailwindcss-language-server".into())
|
||||
|
|
|
@ -19,7 +19,7 @@ fn terraform_ls_binary_arguments() -> Vec<OsString> {
|
|||
|
||||
pub struct TerraformLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for TerraformLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("terraform-ls".into())
|
||||
|
|
|
@ -12,7 +12,7 @@ use util::{github::GitHubLspBinaryVersion, ResultExt};
|
|||
|
||||
pub struct TaploLspAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for TaploLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("taplo-ls".into())
|
||||
|
|
|
@ -50,7 +50,7 @@ struct TypeScriptVersions {
|
|||
server_version: String,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for TypeScriptLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("typescript-language-server".into())
|
||||
|
@ -224,7 +224,7 @@ impl EsLintLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for EsLintLspAdapter {
|
||||
fn workspace_configuration(&self, workspace_root: &Path, cx: &mut AppContext) -> Value {
|
||||
let eslint_user_settings = ProjectSettings::get_global(cx)
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{any::Any, path::PathBuf};
|
|||
|
||||
pub struct UiuaLanguageServer;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for UiuaLanguageServer {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("uiua".into())
|
||||
|
|
|
@ -38,7 +38,7 @@ impl VueLspAdapter {
|
|||
}
|
||||
}
|
||||
}
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl super::LspAdapter for VueLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("vue-language-server".into())
|
||||
|
|
|
@ -33,7 +33,7 @@ impl YamlLspAdapter {
|
|||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for YamlLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("yaml-language-server".into())
|
||||
|
|
|
@ -3,6 +3,7 @@ use async_compression::futures::bufread::GzipDecoder;
|
|||
use async_tar::Archive;
|
||||
use async_trait::async_trait;
|
||||
use futures::{io::BufReader, StreamExt};
|
||||
use gpui::AsyncAppContext;
|
||||
use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
|
||||
use lsp::LanguageServerBinary;
|
||||
use smol::fs;
|
||||
|
@ -14,7 +15,7 @@ use util::{github::GitHubLspBinaryVersion, ResultExt};
|
|||
|
||||
pub struct ZlsAdapter;
|
||||
|
||||
#[async_trait]
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for ZlsAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("zls".into())
|
||||
|
@ -43,6 +44,7 @@ impl LspAdapter for ZlsAdapter {
|
|||
async fn check_if_user_installed(
|
||||
&self,
|
||||
delegate: &dyn LspAdapterDelegate,
|
||||
_cx: &AsyncAppContext,
|
||||
) -> Option<LanguageServerBinary> {
|
||||
let env = delegate.shell_env().await;
|
||||
let path = delegate.which("zls".as_ref()).await?;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue