Fix history and search gadget test

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index a5f2e71b8fe87b4930903b0a135f4b2b030ae95d..6946f3419e368535dfacbf024b03f38b67c4e527 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -3,6 +3,7 @@
 - these things are "Too Slow":
   - all-words
   - make-image
+  - workspace-window
 - menu should stay up if mouse button released
 - roundoff is still not quite right with tracks
 - grid displays quickly now, but constructing large amounts of gadgets
@@ -21,13 +22,18 @@
 - mac intel: struct returns from objc methods
 - faster apropos
 - compiled call traces
-
-+ ui:
-
 - workspace window takes too long to come up
 - new windows don't always have focus, eg focus follows mouse
 - dataflow for [ ] map [ ] subset looks weird (wrong?)
 - listener commands from a menu should not include 'hide-glass' etc
+- bogus compile errors?
+- recompile get/set/>n/n>/ndrop if needed
+- cross-word type inference
+- callback scheduling issue
+- windows crash
+
++ ui:
+
 - some way of intercepting all gestures
 - how do we refer to command shortcuts in the docs?
 - fix top level window positioning
@@ -50,11 +56,7 @@
 
 + compiler/ffi:
 
-- bogus compile error
-- recompile get/set/>n/n>/ndrop if needed
 - %allot-bignum-signed-2 is broken on both platforms
-- cross-word type inference
-- callback scheduling issue
 - we may be able to remove the dlsym primitive
 - [ [ dup call ] dup call ] infer hangs
 - stdcall callbacks
@@ -79,7 +81,6 @@
 
 + misc:
 
-- windows crash
 - growable data heap
 - minor GC takes too long now, we should card mark code heap
 - buffer-ptr should be an alien

diff --git a/library/tools/completion.factor b/library/tools/completion.factor
index dc4d144829f3762375ef1fa7011ab2035b884a2a..8d577811db143b38bbbaa8eaf741458983dd617c 100644 (file)
--- a/library/tools/completion.factor
+++ b/library/tools/completion.factor
@@ -63,8 +63,12 @@ USING: kernel arrays sequences math namespaces strings io ;
     ] if ; inline
 
 : completions ( str quot candidates -- seq )
-    pick empty? over length 100 >= and [
-        3drop f
+    pick empty? [
+        dup length 100 > [
+            3drop f
+        ] [
+            2nip [ 1 2array ] map
+        ] if
     ] [
         [ >r 2dup r> completion ] map 2nip rank-completions
     ] if ; inline

diff --git a/library/ui/test/search.factor b/library/ui/test/search.factor
index 8b0d952fb00f130a6e61617842ba92440295bed0..8e5a836e54f205b328510fd813989bac73ee1006 100644 (file)
--- a/library/ui/test/search.factor
+++ b/library/ui/test/search.factor
@@ -1,6 +1,6 @@
 IN: temporary
 USING: gadgets-search io test namespaces gadgets 
-sequences ;
+sequences threads ;
 
 [ "hey man (score: 123)" ]
 [