tools.completion: fix logic

diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index 52cac654362e85b67031f655b174c9607c1571b0..80b09f882538dc3f308f72780277273c5a19e874 100644 (file)
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -316,11 +316,11 @@ MEMO: load-index ( name -- index )
     "qualified.idx" binary [ serialize ] with-file-writer ;
 
 : qualified-index ( str index -- str index' )
-    over ":" split1 drop [ f ] [
+    over ":" split1 [
         "qualified.idx"
         dup file-exists? [ pick generate-qualified-index ] unless
         load-index completions keys concat
-    ] if-empty [ append ] unless-empty ;
+    ] [ drop f ] if [ append ] unless-empty ;
 
 : word-apropos ( string -- results )
     "words.idx" load-index qualified-index completions ;

diff --git a/basis/tools/completion/completion.factor b/basis/tools/completion/completion.factor
index c0b87f246a3dd1ce293bb7bea2d1893afdb81317..abf7dcb95347b335f2617fc1ea04dc7e9fc02bd5 100644 (file)
--- a/basis/tools/completion/completion.factor
+++ b/basis/tools/completion/completion.factor
@@ -86,12 +86,12 @@ PRIVATE>
     vocab-words named completions ;
 
 : qualified-named ( str -- seq/f )
-    ":" split1 drop [ f ] [
+    ":" split1 [
         vocabs-matching keys [
             [ vocab-words ] [ vocab-name ] bi ":" append
             [ over name>> append ] curry { } map>assoc
         ] map concat
-    ] if-empty ;
+    ] [ drop f ] if ;
 
 : words-matching ( str -- seq )
     all-words named over qualified-named [ append ] unless-empty completions ;