steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui.tools.listener.completion: make sure "USE: vocab <TAB>" works right.

db4
John Benediktsson 2012-07-27 08:47:57 -07:00
parent c26ac5890e
commit 2f93d9dedd
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/ui/tools/listener/completion/completion-tests.factor
View File

@ -7,6 +7,8 @@ IN: ui.tools.listener.completion.tests
[ f ] [ { "USE:" "A" "B" } complete-vocab? ] unit-test [ f ] [ { "USE:" "A" "B" } complete-vocab? ] unit-test
[ f ] [ { "USE:" "A" "" } complete-vocab? ] unit-test
[ t ] [ { "USE:" "A" } complete-vocab? ] unit-test [ t ] [ { "USE:" "A" } complete-vocab? ] unit-test
[ t ] [ { "USE:" } complete-vocab? ] unit-test [ t ] [ { "USE:" } complete-vocab? ] unit-test

16
basis/ui/tools/listener/completion/completion.factor
View File

@ -75,13 +75,17 @@ M: word-completion row-color
M: vocab-completion row-color M: vocab-completion row-color
drop vocab? COLOR: black COLOR: dark-gray ? ; drop vocab? COLOR: black COLOR: dark-gray ? ;
: complete-vocab? ( tokens -- ? ) : (complete-vocab?) ( str -- ? )
harvest 2 short tail* [ f ] [
[
{ "IN:" "USE:" "UNUSE:" "QUALIFIED:" "QUALIFIED-WITH:" } { "IN:" "USE:" "UNUSE:" "QUALIFIED:" "QUALIFIED-WITH:" }
member? member? ; inline
] any?
] if-empty ; : complete-vocab? ( tokens -- ? )
dup last empty? [
harvest ?last (complete-vocab?)
] [
harvest 2 short tail*
[ f ] [ [ (complete-vocab?) ] any? ] if-empty
] if ;
: chop-; ( seq -- seq' ) : chop-; ( seq -- seq' )
{ ";" } split1-last [ ] [ ] ?if ; { ";" } split1-last [ ] [ ] ?if ;