Inline the choice nodes in the CST

crates/solidity/inputs/language/src/definition.rs

@@ -64,8 +64,21 @@ impl codegen_grammar::ParserDefinition for NamedParserThunk {
     }
 
     fn is_inline(&self) -> bool {
-        // The DSL v2 definition already inlines the elements
-        false
+        // HACK: Make sure all keywords are referred to by a parser, so that codegen includes them in the trie.
+        if self.name().ends_with("AllKeywords") {
+            return false;
+        }
+
+        // The DSL v2 definition already inlines the elements, however `Enum`s
+        // are not but should be, since they only have a single reference per variant.
+        match self.node() {
+            ParserDefinitionNode::Versioned(node, _) => match **node {
+                ParserDefinitionNode::Choice(_) => true,
+                _ => false,
+            },
+            ParserDefinitionNode::Choice(_) => true,
+            _ => false,
+        }
     }
 
     fn node(&self) -> &codegen_grammar::ParserDefinitionNode {