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

Temporarily remove JSON plugin + restore native JSON LspAdapter

Browse source
This commit is contained in:
Max Brunsfeld 2022-07-13 13:56:39 -07:00
parent 958fd9ad55
commit dddeb66e2a
3 changed files with 111 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,11 @@ use gpui::executor::Background;
pub use language::*;
use rust_embed::RustEmbed;
use std::{borrow::Cow, str, sync::Arc};
use util::ResultExt;
mod c;
mod go;
mod installation;
mod json;
mod language_plugin;
mod python;
mod rust;
@ -17,7 +17,7 @@ mod typescript;
#[exclude = "*.rs"]
struct LanguageDir;
pub async fn init(languages: Arc<LanguageRegistry>, executor: Arc<Background>) {
pub async fn init(languages: Arc<LanguageRegistry>, _executor: Arc<Background>) {
for (name, grammar, lsp_adapter) in [
(
"c",
@ -37,10 +37,7 @@ pub async fn init(languages: Arc<LanguageRegistry>, executor: Arc<Background>) {
(
"json",
tree_sitter_json::language(),
match language_plugin::new_json(executor).await.log_err() {
Some(lang) => Some(CachedLspAdapter::new(lang).await),
None => None,
},
Some(CachedLspAdapter::new(json::JsonLspAdapter).await),
),
(
"markdown",