better trailing error

src/error.rs

@@ -24,10 +24,10 @@ pub enum ParseError {
     #[diagnostic(transparent)]
     /// An array key was found that is invalid for this position
     UnexpectedArrayKey(ArrayKeyError),
-    #[error("Trailing characters after parsing")]
+    #[error(transparent)]
-    #[diagnostic(code(php_object_parser::trailing))]
+    #[diagnostic(transparent)]
     /// Trailing characters after parsing
-    TrailingCharacters,
+    TrailingCharacters(#[from] TrailingError),
     #[error("{0}")]
     #[diagnostic(code(php_object_parser::serde))]
     /// Error while populating serde type
@@ -216,6 +216,27 @@ impl ArrayKeyError {
     }
 }
 
+#[derive(Debug, Clone, Error, Diagnostic)]
+#[diagnostic(code(php_object_parser::trailing))]
+#[error("Trailing characters after parsing")]
+pub struct TrailingError {
+    src: String,
+    #[snippet(src)]
+    snip: SourceSpan,
+    #[highlight(snip, label("end of parsed value"))]
+    err_span: SourceSpan,
+}
+
+impl TrailingError {
+    pub fn new(source: &str, err_span: Span) -> Self {
+        TrailingError {
+            src: source.into(),
+            snip: map_span(&(0..source.len())),
+            err_span: map_span(&err_span),
+        }
+    }
+}
+
 pub trait ExpectToken<'source> {
     fn expect_token(
         self,

src/serde_impl.rs

@@ -4,7 +4,7 @@ use serde::de::{
 };
 use serde::Deserialize;
 
-use crate::error::{ArrayKeyError, ArrayKeyErrorKind, ExpectToken, ResultExt};
+use crate::error::{ArrayKeyError, ArrayKeyErrorKind, ExpectToken, ResultExt, TrailingError};
 use crate::lexer::{SpannedToken, Token};
 use crate::num::ParseIntError;
 use crate::parser::{ArraySyntax, Parser};
@@ -62,7 +62,7 @@ where
             token: Token::SemiColon,
             ..
         }) => Ok(t),
-        Some(_) => Err(ParseError::TrailingCharacters.into()),
+        Some(token) => Err(TrailingError::new(s, token.span.start..token.span.start).into()),
     }
 }