2 files changed, 18 insertions, 1 deletions

diff --git a/crates/libsyntax2/src/ast/mod.rs b/crates/libsyntax2/src/ast/mod.rs
index d53b12ab8..9b9200f99 100644
--- a/crates/libsyntax2/src/ast/mod.rs
+++ b/crates/libsyntax2/src/ast/mod.rs
@@ -118,3 +118,12 @@ impl <R: TreeRoot> ImplItem<R> {
         (first, second)
     }
 }
+
+impl <R: TreeRoot> Module<R> {
+    pub fn has_semi(&self) -> bool {
+        match self.syntax_ref().last_child() {
+            None => false,
+            Some(node) => node.kind() == SEMI,
+        }
+    }
+}
diff --git a/crates/libsyntax2/src/yellow/syntax.rs b/crates/libsyntax2/src/yellow/syntax.rs
index b264e008a..bb390751a 100644
--- a/crates/libsyntax2/src/yellow/syntax.rs
+++ b/crates/libsyntax2/src/yellow/syntax.rs
@@ -89,7 +89,15 @@ impl<R: TreeRoot> SyntaxNode<R> {
     }
 
     pub fn first_child(&self) -> Option<SyntaxNode<R>> {
-        self.children().next()
+        let red = self.red().get_child(0)?;
+        Some(SyntaxNode { root: self.root.clone(), red })
+    }
+
+    pub fn last_child(&self) -> Option<SyntaxNode<R>> {
+        let n = self.red().n_children();
+        let n = n.checked_sub(1)?;
+        let red = self.red().get_child(n)?;
+        Some(SyntaxNode { root: self.root.clone(), red })
     }
 
     pub fn next_sibling(&self) -> Option<SyntaxNode<R>> {