From 0aa43902cab5dbcddb72ddf5d3b825ef874dc620 Mon Sep 17 00:00:00 2001
From: Cor Peters
Date: Sun, 18 Jul 2021 09:56:25 +0200
Subject: Added option to provide a custom config file to the lsp. (#460)

* Added option to provide a custom config file to the lsp.

* Simplified lsp loading routine with anyhow

* Moved config to language.toml

* Fixed test case

* Cargo fmt

* Revert now-useless changes

* Renamed custom_config to config

Co-authored-by: Cor <prive@corpeters.nl>---
 helix-core/src/indent.rs | 1 +
 helix-core/src/syntax.rs | 1 +
 2 files changed, 2 insertions(+)

(limited to 'helix-core/src')

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 1b36db7b..292ade4b 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -262,6 +262,7 @@ where
                 file_types: vec!["rs".to_string()],
                 language_id: "Rust".to_string(),
                 highlight_config: OnceCell::new(),
+                config: None,
                 //
                 roots: vec![],
                 auto_format: false,
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index f249f5fe..621cd046 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -35,6 +35,7 @@ pub struct LanguageConfiguration {
     pub scope: String,           // source.rust
     pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
     pub roots: Vec<String>,      // these indicate project roots <.git, Cargo.toml>
+    pub config: Option<String>,
 
     #[serde(default)]
     pub auto_format: bool,
-- 
cgit v1.2.3-70-g09d2