5 files changed, 124 insertions, 13 deletions

diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index c9b587ecb..7a2a9c7d4 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
@@ -5,6 +5,30 @@ use {
 };
 
 #[derive(Debug, Clone, Copy)]
+pub struct ConstItem<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for ConstItem<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            CONST_ITEM => Some(ConstItem { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> ConstItem<R> {
+    pub fn name(&self) -> Option<Name<R>> {
+        self.syntax()
+            .children()
+            .filter_map(Name::cast)
+            .next()
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
 pub struct Enum<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
 }
@@ -76,6 +100,30 @@ impl<R: TreeRoot> Function<R> {
 }
 
 #[derive(Debug, Clone, Copy)]
+pub struct Module<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for Module<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            MODULE => Some(Module { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> Module<R> {
+    pub fn name(&self) -> Option<Name<R>> {
+        self.syntax()
+            .children()
+            .filter_map(Name::cast)
+            .next()
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
 pub struct Name<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
 }
@@ -93,6 +141,30 @@ impl<R: TreeRoot> AstNode<R> for Name<R> {
 impl<R: TreeRoot> Name<R> {}
 
 #[derive(Debug, Clone, Copy)]
+pub struct StaticItem<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for StaticItem<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            STATIC_ITEM => Some(StaticItem { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> StaticItem<R> {
+    pub fn name(&self) -> Option<Name<R>> {
+        self.syntax()
+            .children()
+            .filter_map(Name::cast)
+            .next()
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
 pub struct Struct<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
 }
@@ -116,3 +188,27 @@ impl<R: TreeRoot> Struct<R> {
     }
 }
 
+#[derive(Debug, Clone, Copy)]
+pub struct Trait<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for Trait<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            TRAIT => Some(Trait { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> Trait<R> {
+    pub fn name(&self) -> Option<Name<R>> {
+        self.syntax()
+            .children()
+            .filter_map(Name::cast)
+            .next()
+    }
+}
+
diff --git a/crates/libsyntax2/src/ast/generated.rs.tera b/crates/libsyntax2/src/ast/generated.rs.tera
index 09630e427..86b8b05d1 100644
--- a/crates/libsyntax2/src/ast/generated.rs.tera
+++ b/crates/libsyntax2/src/ast/generated.rs.tera
@@ -12,7 +12,7 @@ pub struct {{ node }}<R: TreeRoot = Arc<SyntaxRoot>> {
 impl<R: TreeRoot> AstNode<R> for {{ node }}<R> {
     fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
         match syntax.kind() {
-            {{ node | upper }} => Some({{ node }} { syntax }),
+            {{ node | SCREAM }} => Some({{ node }} { syntax }),
             _ => None,
         }
     }
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index a8916c5c7..c9470d4fa 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -234,6 +234,26 @@ Grammar(
                 ["name", "Name"]
             ]
         ),
+        "Trait": (
+            options: [
+                ["name", "Name"]
+            ]
+        ),
+        "Module": (
+            options: [
+                ["name", "Name"]
+            ]
+        ),
+        "ConstItem": (
+            options: [
+                ["name", "Name"]
+            ]
+        ),
+        "StaticItem": (
+            options: [
+                ["name", "Name"]
+            ]
+        ),
         "Name": (),
     },
 )
diff --git a/crates/tools/Cargo.toml b/crates/tools/Cargo.toml
index 856f7d8cb..32a6fbc91 100644
--- a/crates/tools/Cargo.toml
+++ b/crates/tools/Cargo.toml
@@ -12,3 +12,4 @@ tera = "0.11"
 clap = "2.32.0"
 failure = "0.1.1"
 commandspec = "0.10"
+heck = "0.3.0"
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index d42d3ecb7..b56be141a 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -7,8 +7,10 @@ extern crate tools;
 extern crate walkdir;
 #[macro_use]
 extern crate commandspec;
+extern crate heck;
 
 use clap::{App, Arg, SubCommand};
+use heck::{CamelCase, ShoutySnakeCase};
 use std::{
     collections::HashMap,
     fs,
@@ -87,18 +89,10 @@ fn render_template(template: &str) -> Result<String> {
         .map_err(|e| format_err!("template error: {:?}", e))?;
     tera.register_global_function("concat", Box::new(concat));
     tera.register_filter("camel", |arg, _| {
-        Ok(arg.as_str().unwrap()
-            .split("_")
-            .flat_map(|word| {
-                word.chars()
-                    .next().unwrap()
-                    .to_uppercase()
-                    .chain(
-                        word.chars().skip(1).flat_map(|c| c.to_lowercase())
-                    )
-            })
-            .collect::<String>()
-            .into())
+        Ok(arg.as_str().unwrap().to_camel_case().into())
+    });
+    tera.register_filter("SCREAM", |arg, _| {
+        Ok(arg.as_str().unwrap().to_shouty_snake_case().into())
     });
     let ret = tera
         .render("grammar", &grammar)