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

Re-enable JSON plugin

Browse source
This commit is contained in:
Isaac Clayton 2022-07-14 15:13:12 +02:00
parent b3ac63b7b5
commit 52e4774e8a
3 changed files with 6 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,12 +3,11 @@ pub use language::*;
use lazy_static::lazy_static;
use rust_embed::RustEmbed;
use std::{borrow::Cow, str, sync::Arc};
// use util::ResultExt;
use util::ResultExt;
mod c;
mod go;
mod installation;
mod json;
mod language_plugin;
mod python;
mod rust;
@ -34,7 +33,7 @@ lazy_static! {
.collect();
}
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",
@ -54,12 +53,10 @@ pub async fn init(languages: Arc<LanguageRegistry>, _executor: Arc<Background>)
(
"json",
tree_sitter_json::language(),
Some(CachedLspAdapter::new(json::JsonLspAdapter).await),
// TODO: switch back to plugin
// match language_plugin::new_json(executor).await.log_err() {
// Some(lang) => Some(CachedLspAdapter::new(lang).await),
// None => None,
// },
match language_plugin::new_json(executor).await.log_err() {
Some(lang) => Some(CachedLspAdapter::new(lang).await),
None => None,
},
),
(
"markdown",