function __scriptura_complete_new
    test (count $argv) -ne 0
    or set --function argv (commandline -xpc)[3..] (commandline -ct)

    set --function index (contains --index -- "--" $argv)
    or return

    set --function remaining $argv[(math $index + 1)..]

    __fish_complete_subcommand --commandline $remaining
end