c1f677f · helix · git.iko.soy

on master help sign in

rename tree_sitter_library in LanguageConfig to 'grammar'

c1f677fMichael Davis5 years ago

helix-core/src/indent.rs+1−1

@@ -433,7 +433,7 @@ where

433 comment_token: None,

434 auto_format: false,

435 diagnostic_severity: Severity::Warning,

436− tree_sitter_library: None,

436+ grammar: None,

437 language_server: None,

438 indent: Some(IndentationConfiguration {

439 tab_width: 4,

helix-core/src/syntax.rs+2−4

@@ -108,7 +108,7 @@ pub struct LanguageConfiguration {

108 #[serde(default)]

109 pub diagnostic_severity: Severity,

110

111− pub tree_sitter_library: Option<String>, // tree-sitter library name, defaults to language_id

111+ pub grammar: Option<String>, // tree-sitter grammar name, defaults to language_id

112

113 // content_regex

114 #[serde(default, skip_serializing, deserialize_with = "deserialize_regex")]

@@ -444,9 +444,7 @@ impl LanguageConfiguration {

444 } else {

445 let language = get_language(

446 &crate::RUNTIME_DIR,

447− self.tree_sitter_library

448− .as_deref()

449− .unwrap_or(&self.language_id),

447+ self.grammar.as_deref().unwrap_or(&self.language_id),

450 )

448 )

451 .map_err(|e| log::info!("{}", e))

449 .map_err(|e| log::info!("{}", e))

452 .ok()?;

450 .ok()?;