aboutsummaryrefslogtreecommitdiff
path: root/helix-core
diff options
context:
space:
mode:
authorCor Peters2021-07-18 07:56:25 +0000
committerGitHub2021-07-18 07:56:25 +0000
commit0aa43902cab5dbcddb72ddf5d3b825ef874dc620 (patch)
tree9446d354355f34a9ec2577958e58eca496723c27 /helix-core
parent6cba62b49917fde7c5876a1cce9d3883c6bef6c9 (diff)
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>
Diffstat (limited to 'helix-core')
-rw-r--r--helix-core/src/indent.rs1
-rw-r--r--helix-core/src/syntax.rs1
2 files changed, 2 insertions, 0 deletions
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,