Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for usage and completion #10

Merged
merged 3 commits into from
Oct 18, 2024
Merged

Fix for usage and completion #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ce024f
Fix completion
xb-bx Feb 9, 2024
803ccdc
Fix usage
xb-bx Feb 9, 2024
15a3378
Fix typo in fish completion generation
xb-bx Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Fargo/Fargo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module Usage =
module Fargo =
let cmd name alt description: Arg<string> =
let usage = { Name = Some name; Alt = Option.ofObj alt; Value = None; Description = description; Help = None; Type = UsageType.Required }
let matchusages = { Path = [ usage ]; Options = [usage]}
let matchusages = { Path = [ usage ]; Options = []}
let failusages = { Path = []; Options = [usage]}
let notFound = Error [$"Command %s{name} not found"]
{ Parse =
Expand Down Expand Up @@ -377,7 +377,7 @@ module Fargo =
| Ok x, restx, usagex ->
let argy = f x
let y, resty, usagey = argy.Parse restx
y, resty, { Path = usagey.Path @ usagex.Path; Options = usagey.Options}
y, resty, { Path = usagey.Path @ usagex.Path; Options = usagey.Options @ usagex.Options}
| Error ex, restx, usagex ->
Error ex, restx, usagex
Complete =
Expand All @@ -386,7 +386,13 @@ module Fargo =
| Ok x, restx, usagex ->
if not (Tokens.contains pos tokens) || Tokens.contains pos restx then
let argy = f x
argy.Complete pos restx
let (cpx, ix) = argy.Complete pos restx
let (cpy, iy) = arg.Complete pos tokens
match ix,iy with
| false, false -> cpx @ cpy, false
| true, true -> cpx @ cpy, true
| true, false -> cpx, true
| false, true -> cpy, true
else
arg.Complete pos tokens
| Error _, _, _ ->
Expand Down Expand Up @@ -544,7 +550,7 @@ module Run =
usages.Options
|> List.filter (fun u -> not (u.Name = None || u.IsRequired))

if cmds <> [] then printfn "[command]"
if cmds <> [] then printf "[command] "
if opts <> [] then printf "[options] "
for u in args do
if u.IsArg then
Expand Down Expand Up @@ -676,7 +682,7 @@ Register-ArgumentCompleter -Native -CommandName %s -ScriptBlock {
function __%s_completion
set -l count (commandline -pC)
set -l cmd (commandline -opc)
%s complete --position (math $count - (string length $cmd[1])) - 1 "$cmd[2..]"
%s complete --position (math $count - (string length $cmd[1]) - 1) "$cmd[2..]"
end
complete -f -c %s -a '(__%s_completion)'
""" appName appName appName appName
Expand Down
Loading