aboutsummaryrefslogtreecommitdiff
path: root/helix-lsp/src
diff options
context:
space:
mode:
authorMidnight Exigent2021-10-08 02:14:12 +0000
committerGitHub2021-10-08 02:14:12 +0000
commiteedcea7e6bdae7d18610ae8d035e7f732099e619 (patch)
tree9f016307c7550f69644133de6129b30f7e1e816d /helix-lsp/src
parent9f27be429d0b4848a01876cd0eb192f2db8a830b (diff)
Allow `language.config` (in languages.toml) to be passed in as a toml object (#807)
* allow language.config (in languages.toml) to be passed in as a toml object * Change config field for languages from json string to toml object * remove indents on languages.toml config * fix: remove patch version from serde_json import in helix-core * Use same tree-sitter-zig as upstream/master
Diffstat (limited to 'helix-lsp/src')
-rw-r--r--helix-lsp/src/lib.rs10
1 files changed, 1 insertions, 9 deletions
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 35cff754..7fa65928 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -318,15 +318,7 @@ impl Registry {
let (client, incoming, initialize_notify) = Client::start(
&config.command,
&config.args,
- serde_json::from_str(language_config.config.as_deref().unwrap_or(""))
- .map_err(|e| {
- log::error!(
- "LSP Config, {}, in `languages.toml` for `{}`",
- e,
- language_config.scope()
- )
- })
- .ok(),
+ language_config.config.clone(),
id,
)?;
self.incoming.push(UnboundedReceiverStream::new(incoming));