2 files changed, 18 insertions, 2 deletions

diff --git a/src/tree/file_builder.rs b/src/tree/file_builder.rs
index ddb29a6b9..b07f4027b 100644
--- a/src/tree/file_builder.rs
+++ b/src/tree/file_builder.rs
@@ -156,7 +156,7 @@ impl<'f> ErrorBuilder<'f> {
 
     pub fn emit(self) {
         let message = self.message.expect("Error message not set");
-        let node = self.builder.current_id();
-        self.builder.errors.push(SyntaxErrorData { node, message })
+        let &(node, after_child) = self.builder.in_progress.last().unwrap();
+        self.builder.errors.push(SyntaxErrorData { node, message, after_child })
     }
 }
diff --git a/src/tree/mod.rs b/src/tree/mod.rs
index 3980b23ce..7f4d427ba 100644
--- a/src/tree/mod.rs
+++ b/src/tree/mod.rs
@@ -2,6 +2,7 @@ use text::{TextUnit, TextRange};
 use syntax_kinds::syntax_info;
 
 use std::fmt;
+use std::cmp;
 
 mod file_builder;
 pub use self::file_builder::{FileBuilder, Sink};
@@ -96,6 +97,15 @@ impl<'f> fmt::Debug for Node<'f> {
         }
 }
 
+impl<'f> cmp::PartialEq<Node<'f>> for Node<'f> {
+        fn eq(&self, other: &Node<'f>) -> bool {
+                self.idx == other.idx && ::std::ptr::eq(self.file, other.file)
+        }
+}
+
+impl<'f> cmp::Eq for Node<'f> {
+}
+
 #[derive(Clone, Copy)]
 pub struct SyntaxError<'f> {
         file: &'f File,
@@ -107,6 +117,11 @@ impl<'f> SyntaxError<'f> {
                 self.data().message.as_str()
         }
 
+        pub fn after_child(&self) -> Option<Node<'f>> {
+                let idx = self.data().after_child?;
+                Some(Node { file: self.file, idx })
+        }
+
         fn data(&self) -> &'f SyntaxErrorData {
                 &self.file.errors[self.idx]
         }
@@ -187,6 +202,7 @@ struct ErrorIdx(u32);
 struct SyntaxErrorData {
         node: NodeIdx,
         message: String,
+        after_child: Option<NodeIdx>,
 }
 
 impl ::std::ops::Index<ErrorIdx> for Vec<SyntaxErrorData> {