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

Revert "Merge pull request #1359 from zed-industries/plugin-json-enable"

Browse source 
This reverts commit 94b443a704, reversing
changes made to 285832e810.
This commit is contained in:
Max Brunsfeld 2022-07-18 19:00:52 -07:00
parent 142a019ada
commit 815ce22fb7
3 changed files with 110 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,11 +3,11 @@ pub use language::*;
use lazy_static::lazy_static;
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;
@ -33,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",
@ -53,10 +53,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",