andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix enum definition for use-grammars selections (#1818)

Browse Source 
See https://github.com/helix-editor/helix/discussions/1817

It looks like we need the enums to have the `only`/`except` fields in order
to deserialize correctly.
This commit is contained in:
Michael Davis 2022-03-16 04:26:22 -05:00 committed by GitHub
parent 20a132e36f
commit c6bd105484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helix-loader/src/grammar.rs
View File

@ -27,8 +27,8 @@ struct Configuration {
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "lowercase", untagged)] #[serde(rename_all = "lowercase", untagged)]
pub enum GrammarSelection { pub enum GrammarSelection {
Only(HashSet<String>), Only { only: HashSet<String> },
Except(HashSet<String>), Except { except: HashSet<String> },
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
@ -97,12 +97,12 @@ fn get_grammar_configs() -> Result<Vec<GrammarConfiguration>> {
.try_into()?; .try_into()?;
let grammars = match config.grammar_selection { let grammars = match config.grammar_selection {
Some(GrammarSelection::Only(selections)) => config Some(GrammarSelection::Only { only: selections }) => config
.grammar .grammar
.into_iter() .into_iter()
.filter(|grammar| selections.contains(&grammar.grammar_id)) .filter(|grammar| selections.contains(&grammar.grammar_id))
.collect(), .collect(),
Some(GrammarSelection::Except(rejections)) => config Some(GrammarSelection::Except { except: rejections }) => config
.grammar .grammar
.into_iter() .into_iter()
.filter(|grammar| !rejections.contains(&grammar.grammar_id)) .filter(|grammar| !rejections.contains(&grammar.grammar_id))