unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-17 13:27:30 +03:00
Code Issues Projects Releases Wiki Activity

More intuitive tab completion behaviour (#3406)

Browse Source
This commit is contained in:
Chris Penner 2022-09-10 10:53:05 -05:00 committed by GitHub
parent 91bdd271fa
commit ccdd3d2b7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unison-cli/src/Unison/CommandLine/Completion.hs
View File

@ -143,7 +143,11 @@ completeWithinNamespace compTypes query codebase currentPath = do
& pure
childSuggestions <- getChildSuggestions shortHashLen b
pure . nubOrdOn Haskeline.replacement . List.sortOn Haskeline.replacement $ currentBranchSuggestions <> childSuggestions
let allSuggestions =
currentBranchSuggestions
-- Only show child suggestions when the current branch isn't ambiguous
<> Monoid.whenM (length currentBranchSuggestions <= 1) childSuggestions
pure . nubOrdOn Haskeline.replacement . List.sortOn Haskeline.replacement $ allSuggestions
where
queryPathPrefix :: Path.Path'
querySuffix :: NameSegment.NameSegment

8
unison-src/transcripts/tab-completion.md
View File

@ -16,7 +16,8 @@ Test that tab completion works as expected.
```unison
subnamespace.someName = 1
subnamespace.someOtherName = 2
othernamespace.someName = 3
subnamespace2.thing = 3
othernamespace.someName = 4
unique type subnamespace.AType = A | B
```
@ -28,9 +29,12 @@ unique type subnamespace.AType = A | B
```ucm
-- Should tab complete namespaces since they may contain terms/types
.> debug.tab-complete view sub
-- Should complete things from child namespaces of the current query
-- Should not complete things from child namespaces of the current query if there are other completions at this level
.> debug.tab-complete view subnamespace
-- Should complete things from child namespaces of the current query if it's dot-suffixed
.> debug.tab-complete view subnamespace.
-- Should complete things from child namespaces of the current query if there are no more completions at this level.
.> debug.tab-complete view subnamespace2
-- Should prefix-filter by query suffix
.> debug.tab-complete view subnamespace.some
.> debug.tab-complete view subnamespace.someOther

24
unison-src/transcripts/tab-completion.output.md
View File

@ -30,7 +30,8 @@ Test that tab completion works as expected.
```unison
subnamespace.someName = 1
subnamespace.someOtherName = 2
othernamespace.someName = 3
subnamespace2.thing = 3
othernamespace.someName = 4
unique type subnamespace.AType = A | B
```
@ -47,6 +48,7 @@ unique type subnamespace.AType = A | B
othernamespace.someName : ##Nat
subnamespace.someName : ##Nat
subnamespace.someOtherName : ##Nat
subnamespace2.thing : ##Nat
```
```ucm
@ -54,16 +56,15 @@ unique type subnamespace.AType = A | B
.> debug.tab-complete view sub
subnamespace.
subnamespace2.
-- Should complete things from child namespaces of the current query
-- Should not complete things from child namespaces of the current query if there are other completions at this level
.> debug.tab-complete view subnamespace
subnamespace.
* subnamespace.AType
subnamespace.AType.
* subnamespace.someName
* subnamespace.someOtherName
subnamespace.
subnamespace2.
-- Should complete things from child namespaces of the current query if it's dot-suffixed
.> debug.tab-complete view subnamespace.
* subnamespace.AType
@ -71,6 +72,12 @@ unique type subnamespace.AType = A | B
* subnamespace.someName
* subnamespace.someOtherName
-- Should complete things from child namespaces of the current query if there are no more completions at this level.
.> debug.tab-complete view subnamespace2
subnamespace2.
* subnamespace2.thing
-- Should prefix-filter by query suffix
.> debug.tab-complete view subnamespace.some
@ -95,11 +102,12 @@ unique type subnamespace.AType = A | B
.> debug.tab-complete cd sub
subnamespace
subnamespace2
.> debug.tab-complete cd subnamespace
subnamespace
subnamespace.AType
subnamespace2
.> debug.tab-complete cd subnamespace.