From ca1e8e05179a42ae972e8a95a295ad46b900f1c5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@shill.local>
Date: Mon, 13 Apr 2009 19:42:53 -0500
Subject: [PATCH] ui.tools.error-list: better sorting and output

---
 basis/debugger/debugger.factor              | 5 ++---
 basis/ui/tools/error-list/error-list.factor | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index dc99443853..bcb9411d3c 100644
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -309,15 +309,14 @@ M: source-file-error error.
         [
             [
                 [ file>> [ % ": " % ] when* ]
-                [ line#>> [ # ": " % ] when* ]
-                [ summary % ] tri
+                [ line#>> [ # ": " % ] when* ] bi
             ] "" make
         ] [
             [
                 presented set
                 bold font-style set
             ] H{ } make-assoc
-        ] bi format nl
+        ] bi format
     ] [ error>> error. ] bi ;
 
 M: bad-effect summary
diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index 666801b361..499dc40115 100644
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -97,7 +97,8 @@ M: error-renderer column-titles
 M: error-renderer column-alignment drop { 0 1 0 0 } ;
 
 : sort-errors ( seq -- seq' )
-    [ [ [ file>> ] [ line#>> ] bi 2array ] compare ] sort ;
+    [ [ [ asset>> ] [ line#>> ] bi 2array ] keep ] { } map>assoc
+    sort-keys values ;
 
 : file-matches? ( error pathname/f -- ? )
     [ file>> ] [ dup [ string>> ] when ] bi* = ;