From 6e2b7da22f146140da6db782c74d07826c71d830 Mon Sep 17 00:00:00 2001
From: Araozu <fernando@araozu.dev>
Date: Tue, 26 Dec 2023 19:42:41 -0500
Subject: [PATCH] Improve code display in error msg

---
 src/error_handling/lex_error.rs | 29 +++++++++++++++++------------
 src/lexic/mod.rs                |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/error_handling/lex_error.rs b/src/error_handling/lex_error.rs
index 8672da6..6d87367 100644
--- a/src/error_handling/lex_error.rs
+++ b/src/error_handling/lex_error.rs
@@ -2,21 +2,22 @@ use super::{LexError, PrintableError};
 use std::collections::VecDeque;
 
 impl PrintableError for LexError {
-    // TODO: Count and show line number
     fn get_error_str(&self, chars: &Vec<char>) -> String {
         let line_number = get_line_number(chars, self.position);
-        let (erroneous_code, back_count) = get_line(chars, self.position);
+        let (erroneous_code, column_number_zero) = get_line(chars, self.position);
+        let column_number = column_number_zero + 1;
 
-        let whitespace = " ".repeat(back_count + line_number.to_string().len() + 1);
+        let line_number_whitespace = " ".repeat(line_number.to_string().len());
+        let whitespace = " ".repeat(column_number_zero);
+        let reason = &self.reason;
 
         format!(
-            "\n{}|{}\n{}^\n\n{}{}\n{}",
-            line_number,
-            erroneous_code,
-            whitespace,
-            "Invalid character at pos ",
-            self.position + 1,
-            self.reason,
+            r#"
+{line_number_whitespace} |
+{line_number           } | {erroneous_code}
+{line_number_whitespace} | {whitespace}^
+
+{reason} at line {line_number}:{column_number}"#,
         )
     }
 }
@@ -104,8 +105,12 @@ mod tests {
                 let err_str = err_data.get_error_str(&chars);
 
                 let expected_str = format!(
-                    "\n1|{}\n  {}^\n\nInvalid character at pos 9\n{}",
-                    "val name' = 20", "        ", "Unrecognized character `'` (escaped: `\\'`)"
+                    r#"
+  |
+1 | val name' = 20
+  |         ^
+
+Illegal character `'` (escaped: \') at line 1:9"#,
                 );
 
                 assert_eq!(expected_str, err_str,);
diff --git a/src/lexic/mod.rs b/src/lexic/mod.rs
index 64e10cf..e7ec2a0 100755
--- a/src/lexic/mod.rs
+++ b/src/lexic/mod.rs
@@ -120,7 +120,7 @@ fn next_token(
             let error = LexError {
                 position: current_pos,
                 reason: format!(
-                    "Unrecognized character `{}` (escaped: `{}`)",
+                    "Illegal character `{}` (escaped: {})",
                     next_char,
                     next_char.escape_default().to_string(),
                 ),