1 files changed, 10 insertions, 4 deletions

diff --git a/src/bin/gen.rs b/src/bin/gen.rs
index 4acf381e3..f5a66d9f2 100644
--- a/src/bin/gen.rs
+++ b/src/bin/gen.rs
@@ -17,7 +17,8 @@ fn main() {
 
 #[derive(Deserialize)]
 struct Grammar {
-    syntax_kinds: Vec<String>,
+    tokens: Vec<String>,
+    nodes: Vec<String>,
 }
 
 impl Grammar {
@@ -31,7 +32,12 @@ impl Grammar {
         acc.push_str("// Generated from grammar.ron\n");
         acc.push_str("use tree::{SyntaxKind, SyntaxInfo};\n");
         acc.push_str("\n");
-        for (idx, kind) in self.syntax_kinds.iter().enumerate() {
+
+        let syntax_kinds: Vec<&String> =
+            self.tokens.iter().chain(self.nodes.iter())
+                .collect();
+
+        for (idx, kind) in syntax_kinds.iter().enumerate() {
             let sname = scream(kind);
             write!(
                 acc,
@@ -40,8 +46,8 @@ impl Grammar {
             ).unwrap();
         }
         acc.push_str("\n");
-        write!(acc, "static INFOS: [SyntaxInfo; {}] = [\n", self.syntax_kinds.len()).unwrap();
-        for kind in self.syntax_kinds.iter() {
+        write!(acc, "static INFOS: [SyntaxInfo; {}] = [\n", syntax_kinds.len()).unwrap();
+        for kind in syntax_kinds.iter() {
             let sname = scream(kind);
             write!(
                 acc,