From 388ad5ad8f18ff811c3ab307d2e2c8af6a1a75be Mon Sep 17 00:00:00 2001
From: James Dinsdale <hi@molovo.co>
Date: Thu, 2 Feb 2017 00:45:21 +0000
Subject: [PATCH] Improve style of trace output

---
 README.md |  2 +-
 crash     | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 68fe69c..ec9bdeb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Crash
 
-Proper error handling, exceptions and try/catch for ZSH
+Proper error handling, exceptions and try/catch for ZSH.
 
 ## Installation
 
diff --git a/crash b/crash
index 4ece74a..667c037 100755
--- a/crash
+++ b/crash
@@ -67,6 +67,26 @@ function _crash_map_exit_code() {
   echo $sig_name
 }
 
+###
+# Format and output trace info
+###
+function _crash_format_trace_info() {
+  local tracetype="$1"
+  local -a str; str=("${(s/:/)2}")
+  local node=${str[1]} line=${str[2]} color
+
+  if [[ $tracetype = 'file' ]]; then
+    node=$(realpath $node)
+    color='\033[0;35m'
+  fi
+
+  if [[ $tracetype = 'function' ]]; then
+    color='\033[1;33m'
+  fi
+
+  echo "$color$node\033[0;m \033[0;38;5;242m:\033[0;m line $line"
+}
+
 ###
 # A function which throws an exception if it hasn't been caught
 ###
@@ -114,8 +134,8 @@ function _crash_global_exception_handler() {
 
   # Print the function and file/line where the exception was thrown
   echo
-  echo "  in \033[0;33m${trace[1]}\033[0;m"
-  echo "  at \033[0;35m${files[1]}\033[0;m"
+  echo "  in $(_crash_format_trace_info 'function' ${trace[1]})"
+  echo "  at $(_crash_format_trace_info 'file' ${files[1]})"
 
   # Loop backwards through the trace, printing the function
   # and file/line for each step
@@ -125,8 +145,8 @@ function _crash_global_exception_handler() {
     shift files
 
     echo
-    echo "  $i   \033[0;33m${trace[1]}\033[0;m"
-    echo "      \033[0;35m${files[1]}\033[0;m"
+    echo "  \033[0;38;5;242m$i\033[0;m   $(_crash_format_trace_info 'function' ${trace[1]})"
+    echo "      $(_crash_format_trace_info 'file' ${files[1]})"
 
     i=$(( i + 1 ))
   done