From 1bca9ccecb9edb583a0a94bd3611147b66909ab9 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 4 May 2022 23:26:15 +0200
Subject: Improve diagnostics

---
 src/parse/parser.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/parse/parser.rs')

diff --git a/src/parse/parser.rs b/src/parse/parser.rs
index 50bb5711..f3a3ffd1 100644
--- a/src/parse/parser.rs
+++ b/src/parse/parser.rs
@@ -4,6 +4,7 @@ use std::ops::Range;
 
 use super::{TokenMode, Tokens};
 use crate::syntax::{ErrorPos, Green, GreenData, GreenNode, NodeKind};
+use crate::util::EcoString;
 
 /// A convenient token-based parser.
 pub struct Parser<'s> {
@@ -474,7 +475,12 @@ impl Marker {
             }
 
             if let Err(msg) = f(child) {
-                let error = NodeKind::Error(ErrorPos::Full, msg.into());
+                let mut msg = EcoString::from(msg);
+                if msg.starts_with("expected") {
+                    msg.push_str(", found ");
+                    msg.push_str(child.kind().as_str());
+                }
+                let error = NodeKind::Error(ErrorPos::Full, msg);
                 let inner = mem::take(child);
                 *child = GreenNode::with_child(error, inner).into();
             }
-- 
cgit v1.2.3