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

Rename LspAdapterTrait to LspAdapter and LspAdapter to CachedLspAdapter

Browse source
This commit is contained in:
Isaac Clayton 2022-07-12 09:29:38 +02:00
parent aeb1b89c25
commit d8b22a200e
9 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/zed/src/languages.rs
View file

@ -22,23 +22,23 @@ pub async fn init(languages: Arc<LanguageRegistry>, executor: Arc<Background>) {
(
"c",
tree_sitter_c::language(),
Some(LspAdapter::new(c::CLspAdapter).await),
Some(CachedLspAdapter::new(c::CLspAdapter).await),
),
(
"cpp",
tree_sitter_cpp::language(),
Some(LspAdapter::new(c::CLspAdapter).await),
Some(CachedLspAdapter::new(c::CLspAdapter).await),
),
(
"go",
tree_sitter_go::language(),
Some(LspAdapter::new(go::GoLspAdapter).await),
Some(CachedLspAdapter::new(go::GoLspAdapter).await),
),
(
"json",
tree_sitter_json::language(),
match language_plugin::new_json(executor).await.log_err() {
Some(lang) => Some(LspAdapter::new(lang).await),
Some(lang) => Some(CachedLspAdapter::new(lang).await),
None => None,
},
),
@ -50,12 +50,12 @@ pub async fn init(languages: Arc<LanguageRegistry>, executor: Arc<Background>) {
(
"python",
tree_sitter_python::language(),
Some(LspAdapter::new(python::PythonLspAdapter).await),
Some(CachedLspAdapter::new(python::PythonLspAdapter).await),
),
(
"rust",
tree_sitter_rust::language(),
Some(LspAdapter::new(rust::RustLspAdapter).await),
Some(CachedLspAdapter::new(rust::RustLspAdapter).await),
),
(
"toml",
@ -65,17 +65,17 @@ pub async fn init(languages: Arc<LanguageRegistry>, executor: Arc<Background>) {
(
"tsx",
tree_sitter_typescript::language_tsx(),
Some(LspAdapter::new(typescript::TypeScriptLspAdapter).await),
Some(CachedLspAdapter::new(typescript::TypeScriptLspAdapter).await),
),
(
"typescript",
tree_sitter_typescript::language_typescript(),
Some(LspAdapter::new(typescript::TypeScriptLspAdapter).await),
Some(CachedLspAdapter::new(typescript::TypeScriptLspAdapter).await),
),
(
"javascript",
tree_sitter_typescript::language_tsx(),
Some(LspAdapter::new(typescript::TypeScriptLspAdapter).await),
Some(CachedLspAdapter::new(typescript::TypeScriptLspAdapter).await),
),
] {
languages.add(Arc::new(language(name, grammar, lsp_adapter)));
@ -85,7 +85,7 @@ pub async fn init(languages: Arc<LanguageRegistry>, executor: Arc<Background>) {
pub(crate) fn language(
name: &str,
grammar: tree_sitter::Language,
lsp_adapter: Option<Arc<LspAdapter>>,
lsp_adapter: Option<Arc<CachedLspAdapter>>,
) -> Language {
let config = toml::from_slice(
&LanguageDir::get(&format!("{}/config.toml", name))

2
crates/zed/src/languages/c.rs
View file

@ -11,7 +11,7 @@ use util::ResultExt;
pub struct CLspAdapter;
#[async_trait]
impl super::LspAdapterTrait for CLspAdapter {
impl super::LspAdapter for CLspAdapter {
async fn name(&self) -> LanguageServerName {
LanguageServerName("clangd".into())
}

4
crates/zed/src/languages/go.rs
View file

@ -18,7 +18,7 @@ lazy_static! {
}
#[async_trait]
impl super::LspAdapterTrait for GoLspAdapter {
impl super::LspAdapter for GoLspAdapter {
async fn name(&self) -> LanguageServerName {
LanguageServerName("gopls".into())
}
@ -314,7 +314,7 @@ mod tests {
let language = language(
"go",
tree_sitter_go::language(),
Some(LspAdapter::new(GoLspAdapter).await),
Some(CachedLspAdapter::new(GoLspAdapter).await),
);
let theme = SyntaxTheme::new(vec![

4
crates/zed/src/languages/language_plugin.rs
View file

@ -3,7 +3,7 @@ use async_trait::async_trait;
use client::http::HttpClient;
use futures::lock::Mutex;
use gpui::executor::Background;
use language::{LanguageServerName, LspAdapterTrait};
use language::{LanguageServerName, LspAdapter};
use plugin_runtime::{Plugin, PluginBuilder, WasiFn};
use std::{any::Any, path::PathBuf, sync::Arc};
use util::ResultExt;
@ -55,7 +55,7 @@ impl PluginLspAdapter {
}
#[async_trait]
impl LspAdapterTrait for PluginLspAdapter {
impl LspAdapter for PluginLspAdapter {
async fn name(&self) -> LanguageServerName {
let name: String = self
.runtime

4
crates/zed/src/languages/python.rs
View file

@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
use async_trait::async_trait;
use client::http::HttpClient;
use futures::StreamExt;
use language::{LanguageServerName, LspAdapterTrait};
use language::{LanguageServerName, LspAdapter};
use smol::fs;
use std::{any::Any, path::PathBuf, sync::Arc};
use util::ResultExt;
@ -15,7 +15,7 @@ impl PythonLspAdapter {
}
#[async_trait]
impl LspAdapterTrait for PythonLspAdapter {
impl LspAdapter for PythonLspAdapter {
async fn name(&self) -> LanguageServerName {
LanguageServerName("pyright".into())
}

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

@ -14,7 +14,7 @@ use util::ResultExt;
pub struct RustLspAdapter;
#[async_trait]
impl LspAdapterTrait for RustLspAdapter {
impl LspAdapter for RustLspAdapter {
async fn name(&self) -> LanguageServerName {
LanguageServerName("rust-analyzer".into())
}
@ -255,7 +255,7 @@ impl LspAdapterTrait for RustLspAdapter {
#[cfg(test)]
mod tests {
use super::*;
use crate::languages::{language, LspAdapter};
use crate::languages::{language, CachedLspAdapter};
use gpui::{color::Color, MutableAppContext};
use theme::SyntaxTheme;
@ -305,7 +305,7 @@ mod tests {
let language = language(
"rust",
tree_sitter_rust::language(),
Some(LspAdapter::new(RustLspAdapter).await),
Some(CachedLspAdapter::new(RustLspAdapter).await),
);
let grammar = language.grammar().unwrap();
let theme = SyntaxTheme::new(vec![
@ -390,7 +390,7 @@ mod tests {
let language = language(
"rust",
tree_sitter_rust::language(),
Some(LspAdapter::new(RustLspAdapter).await),
Some(CachedLspAdapter::new(RustLspAdapter).await),
);
let grammar = language.grammar().unwrap();
let theme = SyntaxTheme::new(vec![

4
crates/zed/src/languages/typescript.rs
View file

@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
use async_trait::async_trait;
use client::http::HttpClient;
use futures::StreamExt;
use language::{LanguageServerName, LspAdapterTrait};
use language::{LanguageServerName, LspAdapter};
use serde_json::json;
use smol::fs;
use std::{any::Any, path::PathBuf, sync::Arc};
@ -21,7 +21,7 @@ struct Versions {
}
#[async_trait]
impl LspAdapterTrait for TypeScriptLspAdapter {
impl LspAdapter for TypeScriptLspAdapter {
async fn name(&self) -> LanguageServerName {
LanguageServerName("typescript-language-server".into())
}