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

Simplify Haskell LSP integration

Browse source 
This change will work without any configuration and assume the user will install the Haskell Language Server using `ghcup`
This commit is contained in:
Pseudomata 2024-01-26 20:19:36 -05:00
parent 652ec6fb3e
commit 030ff0acf3
No known key found for this signature in database
3 changed files with 25 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use settings::Settings;
use std::{borrow::Cow, str, sync::Arc};
use util::{asset_str, paths::PLUGINS_DIR};
use self::{deno::DenoSettings, elixir::ElixirSettings, haskell::HaskellSettings};
use self::{deno::DenoSettings, elixir::ElixirSettings};
mod c;
mod css;
@ -55,7 +55,6 @@ pub fn init(
) {
ElixirSettings::register(cx);
DenoSettings::register(cx);
HaskellSettings::register(cx);
let language = |name, grammar, adapters| {
languages.register(name, load_config(name), grammar, adapters, load_queries)
@ -204,20 +203,11 @@ pub fn init(
}
}
match &HaskellSettings::get(None, cx).lsp {
haskell::HaskellLspSetting::None => {
language("haskell", tree_sitter_haskell::language(), vec![])
}
haskell::HaskellLspSetting::Local { path, arguments } => language(
"haskell",
tree_sitter_haskell::language(),
vec![Arc::new(haskell::LocalLspAdapter {
path: path.clone(),
arguments: arguments.clone(),
})],
),
}
language(
"haskell",
tree_sitter_haskell::language(),
vec![Arc::new(haskell::HaskellLanguageServer {})],
);
language(
"html",
tree_sitter_html::language(),