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

Use LanguageServerName in more places (#18167)

Browse source 
This pushes the new LanguageServerName type to more places.

As both languages and language servers were identified by Arc<str>, it
was
sometimes hard to tell which was intended.

Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2024-09-20 18:51:34 -06:00 • committed by GitHub
parent 743feb98bc
commit 4f227fd3bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 150 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/languages/src/rust.rs
View file

@ -25,13 +25,13 @@ use util::{fs::remove_matching, maybe, ResultExt};
pub struct RustLspAdapter;
impl RustLspAdapter {
const SERVER_NAME: &'static str = "rust-analyzer";
const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("rust-analyzer");
}
#[async_trait(?Send)]
impl LspAdapter for RustLspAdapter {
fn name(&self) -> LanguageServerName {
LanguageServerName(Self::SERVER_NAME.into())
Self::SERVER_NAME.clone()
}
async fn check_if_user_installed(
@ -41,7 +41,7 @@ impl LspAdapter for RustLspAdapter {
) -> Option<LanguageServerBinary> {
let configured_binary = cx
.update(|cx| {
language_server_settings(delegate, Self::SERVER_NAME, cx)
language_server_settings(delegate, &Self::SERVER_NAME, cx)
.and_then(|s| s.binary.clone())
})
.ok()?;
@ -60,7 +60,7 @@ impl LspAdapter for RustLspAdapter {
path_lookup: None,
..
}) => {
let path = delegate.which(Self::SERVER_NAME.as_ref()).await;
let path = delegate.which("rust-analyzer".as_ref()).await;
let env = delegate.shell_env().await;
if let Some(path) = path {