diff options
| author | Michael Davis | 2022-03-16 09:26:22 +0000 |
|---|---|---|
| committer | GitHub | 2022-03-16 09:26:22 +0000 |
| commit | c6bd105484fbaf35812dddc41b8fb32cb054fc54 (patch) | |
| tree | c3cdd9aa47f866615cbd46bf9547287e75ddb2b1 | |
| parent | 20a132e36f5406de54a3a4cfe2e8396a79c5d393 (diff) | |
fix enum definition for use-grammars selections (#1818)
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.
| -rw-r--r-- | helix-loader/src/grammar.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs index 378e4203..299a06bf 100644 --- a/helix-loader/src/grammar.rs +++ b/helix-loader/src/grammar.rs @@ -27,8 +27,8 @@ struct Configuration { #[derive(Debug, Serialize, Deserialize)] #[serde(rename_all = "lowercase", untagged)] pub enum GrammarSelection { - Only(HashSet<String>), - Except(HashSet<String>), + Only { only: HashSet<String> }, + Except { except: HashSet<String> }, } #[derive(Debug, Serialize, Deserialize)] @@ -97,12 +97,12 @@ fn get_grammar_configs() -> Result<Vec<GrammarConfiguration>> { .try_into()?; let grammars = match config.grammar_selection { - Some(GrammarSelection::Only(selections)) => config + Some(GrammarSelection::Only { only: selections }) => config .grammar .into_iter() .filter(|grammar| selections.contains(&grammar.grammar_id)) .collect(), - Some(GrammarSelection::Except(rejections)) => config + Some(GrammarSelection::Except { except: rejections }) => config .grammar .into_iter() .filter(|grammar| !rejections.contains(&grammar.grammar_id)) |