Fixed bug in completion and added short names

nicolas-p · Dec 24, 2017 · ad1f103 · ad1f103
1 parent 3b1ff2f
commit ad1f103
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/basis/code/code.factor b/basis/code/code.factor
@@ -275,13 +275,16 @@ CONSTANT: special-variadic-words { "call" }
       [ elt (in-out) ]
     } cond ;
 
+: short-name ( str -- str )
+    " (constructor)" " (accessor)" " (mutator)" [ "" replace ] tri@ ;
+
 :: matching-words ( str -- seq )
     ! returns all Factor words whose name begins with a certain string
     interactive-vocabs get [ vocabs:vocab-words ] map concat [ name>> str head? ] filter ;
 
 :: matching-words-exact ( str -- seq )
     ! returns all Factor words that have a certain name
-    interactive-vocabs get [ vocabs:vocab-words ] map concat [ name>> str = ] filter ;
+    interactive-vocabs get [ vocabs:vocab-words ] map concat [ name>> short-name str = ] filter ;
 
 :: find-target ( call -- seq )
     ! returns the Factor word that has the same name as the call

diff --git a/basis/ui/tools/environment/cell/cell.factor b/basis/ui/tools/environment/cell/cell.factor
@@ -148,7 +148,7 @@ M: cell graft*
 
 :: ask-for-completion ( cell -- )
     cell children>> [ editor? ] filter first editor-string
-    [ cell model>> [ swap >>name t >>completion ] with change-model
+    [ cell model>> [ swap [ >>name ] [ matching-words >>completion ] bi ] with change-model
       cell selection>> notify-connections ] unless-empty ;
 
 cell H{

diff --git a/basis/ui/tools/environment/tree/tree.factor b/basis/ui/tools/environment/tree/tree.factor
@@ -135,7 +135,7 @@ M:: path-display model-changed ( model path-display -- )
     model value>> call? [
         model value>> target>> number? [
             model value>> completion>>
-            [ model value>> name>> matching-words [ <path-item> ] map add-gadgets ]
+            [ model value>> completion>> [ <path-item> ] map add-gadgets ]
             [ model value>> target>> [ <path-item> add-gadget ] when* ] if
         ] unless
     ] when drop ;
@@ -149,7 +149,7 @@ M:: path-display model-changed ( model path-display -- )
 
 : choose-word ( path-item -- )
     [ word>> ] [ parent>> model>> ] bi
-    [ swap >>target dup target>> name>> >>name f >>completion ] with change-model ;
+    [ swap >>target dup target>> name>> short-name >>name f >>completion ] with change-model ;
 
 : select-word ( path-item -- )
     dark-background second <solid> >>interior relayout-1 ;