on master help sign in
fix enum definition for use-grammars selections (#1818)
c6bd105Michael Davis
helix-loader/src/grammar.rs+4−4
@@ -27,8 +27,8 @@ struct Configuration {
27#[derive(Debug, Serialize, Deserialize)]
27#[derive(Debug, Serialize, Deserialize)]
28#[serde(rename_all = "lowercase", untagged)]
28#[serde(rename_all = "lowercase", untagged)]
29pub enum GrammarSelection {
29pub enum GrammarSelection {
30− Only(HashSet<String>),
30+ Only { only: HashSet<String> },
31− Except(HashSet<String>),
31+ Except { except: HashSet<String> },
32}
32}
33
33
34#[derive(Debug, Serialize, Deserialize)]
34#[derive(Debug, Serialize, Deserialize)]
@@ -97,12 +97,12 @@ fn get_grammar_configs() -> Result<Vec<GrammarConfiguration>> {
97 .try_into()?;
97 .try_into()?;
98
98
99 let grammars = match config.grammar_selection {
99 let grammars = match config.grammar_selection {
100− Some(GrammarSelection::Only(selections)) => config
100+ Some(GrammarSelection::Only { only: selections }) => config
101 .grammar
101 .grammar
102 .into_iter()
102 .into_iter()
103 .filter(|grammar| selections.contains(&grammar.grammar_id))
103 .filter(|grammar| selections.contains(&grammar.grammar_id))
104 .collect(),
104 .collect(),
105− Some(GrammarSelection::Except(rejections)) => config
105+ Some(GrammarSelection::Except { except: rejections }) => config
106 .grammar
106 .grammar
107 .into_iter()
107 .into_iter()
108 .filter(|grammar| !rejections.contains(&grammar.grammar_id))
108 .filter(|grammar| !rejections.contains(&grammar.grammar_id))