diff options
| author | Gokul Soumya | 2022-01-06 05:56:35 +0000 |
|---|---|---|
| committer | Gokul Soumya | 2022-01-06 06:02:03 +0000 |
| commit | 449624965b05fd2abc9e3ba2f791f8de8b1eeb3e (patch) | |
| tree | cbe060df6a61330e6a470c521ed254f5c7dc4f4f /helix-core/src/syntax.rs | |
| parent | c0bbadcaaf42698d102fa03f6f9267021f3efec0 (diff) | |
| parent | 2e02a1d6bc004212033b9c4e5ed0de0fd880796c (diff) | |
Merge branch 'master' into cursor-shape-new
Diffstat (limited to 'helix-core/src/syntax.rs')
| -rw-r--r-- | helix-core/src/syntax.rs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs index ef35fc75..5d37c219 100644 --- a/helix-core/src/syntax.rs +++ b/helix-core/src/syntax.rs @@ -1,5 +1,6 @@ use crate::{ chars::char_is_line_ending, + diagnostic::Severity, regex::Regex, transaction::{ChangeSet, Operation}, Rope, RopeSlice, Tendril, @@ -63,6 +64,10 @@ pub struct LanguageConfiguration { #[serde(default)] pub auto_format: bool, + #[serde(default)] + pub diagnostic_severity: Severity, + + pub tree_sitter_library: Option<String>, // tree-sitter library name, defaults to language_id // content_regex #[serde(default, skip_serializing, deserialize_with = "deserialize_regex")] @@ -189,9 +194,14 @@ impl LanguageConfiguration { if highlights_query.is_empty() { None } else { - let language = get_language(&crate::RUNTIME_DIR, &self.language_id) - .map_err(|e| log::info!("{}", e)) - .ok()?; + let language = get_language( + &crate::RUNTIME_DIR, + self.tree_sitter_library + .as_deref() + .unwrap_or(&self.language_id), + ) + .map_err(|e| log::info!("{}", e)) + .ok()?; let config = HighlightConfiguration::new( language, &highlights_query, |