vendor: update complete version to v1.1
Update posener/complete to revision=v1.1. Leave only once occurrence of posener/complete in vendor, there was an occurrence for each package individualy. The formatting of vendor/vendor.json has changed after using the command "govendor fetch github.com/posener/complete@=v1.1"
This commit is contained in:
parent
45406d4b79
commit
2948fa9296
|
@ -3,6 +3,8 @@ package complete
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Args describes command line arguments
|
// Args describes command line arguments
|
||||||
|
@ -37,16 +39,41 @@ func (a Args) Directory() string {
|
||||||
return fixPathForm(a.Last, dir)
|
return fixPathForm(a.Last, dir)
|
||||||
}
|
}
|
||||||
|
|
||||||
func newArgs(line []string) Args {
|
func newArgs(line string) Args {
|
||||||
completed := removeLast(line[1:])
|
var (
|
||||||
|
all []string
|
||||||
|
completed []string
|
||||||
|
)
|
||||||
|
parts := splitFields(line)
|
||||||
|
if len(parts) > 0 {
|
||||||
|
all = parts[1:]
|
||||||
|
completed = removeLast(parts[1:])
|
||||||
|
}
|
||||||
return Args{
|
return Args{
|
||||||
All: line[1:],
|
All: all,
|
||||||
Completed: completed,
|
Completed: completed,
|
||||||
Last: last(line),
|
Last: last(parts),
|
||||||
LastCompleted: last(completed),
|
LastCompleted: last(completed),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func splitFields(line string) []string {
|
||||||
|
parts := strings.Fields(line)
|
||||||
|
if len(line) > 0 && unicode.IsSpace(rune(line[len(line)-1])) {
|
||||||
|
parts = append(parts, "")
|
||||||
|
}
|
||||||
|
parts = splitLastEqual(parts)
|
||||||
|
return parts
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitLastEqual(line []string) []string {
|
||||||
|
if len(line) == 0 {
|
||||||
|
return line
|
||||||
|
}
|
||||||
|
parts := strings.Split(line[len(line)-1], "=")
|
||||||
|
return append(line[:len(line)-1], parts...)
|
||||||
|
}
|
||||||
|
|
||||||
func (a Args) from(i int) Args {
|
func (a Args) from(i int) Args {
|
||||||
if i > len(a.All) {
|
if i > len(a.All) {
|
||||||
i = len(a.All)
|
i = len(a.All)
|
||||||
|
@ -67,9 +94,9 @@ func removeLast(a []string) []string {
|
||||||
return a
|
return a
|
||||||
}
|
}
|
||||||
|
|
||||||
func last(args []string) (last string) {
|
func last(args []string) string {
|
||||||
if len(args) > 0 {
|
if len(args) == 0 {
|
||||||
last = args[len(args)-1]
|
return ""
|
||||||
}
|
}
|
||||||
return
|
return args[len(args)-1]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package complete
|
package complete
|
||||||
|
|
||||||
import "github.com/posener/complete/match"
|
|
||||||
|
|
||||||
// Command represents a command line
|
// Command represents a command line
|
||||||
// It holds the data that enables auto completion of command line
|
// It holds the data that enables auto completion of command line
|
||||||
// Command can also be a sub command.
|
// Command can also be a sub command.
|
||||||
|
@ -25,9 +23,9 @@ type Command struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Predict returns all possible predictions for args according to the command struct
|
// Predict returns all possible predictions for args according to the command struct
|
||||||
func (c *Command) Predict(a Args) (predictions []string) {
|
func (c *Command) Predict(a Args) []string {
|
||||||
predictions, _ = c.predict(a)
|
options, _ := c.predict(a)
|
||||||
return
|
return options
|
||||||
}
|
}
|
||||||
|
|
||||||
// Commands is the type of Sub member, it maps a command name to a command struct
|
// Commands is the type of Sub member, it maps a command name to a command struct
|
||||||
|
@ -36,9 +34,7 @@ type Commands map[string]Command
|
||||||
// Predict completion of sub command names names according to command line arguments
|
// Predict completion of sub command names names according to command line arguments
|
||||||
func (c Commands) Predict(a Args) (prediction []string) {
|
func (c Commands) Predict(a Args) (prediction []string) {
|
||||||
for sub := range c {
|
for sub := range c {
|
||||||
if match.Prefix(sub, a.Last) {
|
prediction = append(prediction, sub)
|
||||||
prediction = append(prediction, sub)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -56,10 +52,7 @@ func (f Flags) Predict(a Args) (prediction []string) {
|
||||||
if flagHyphenStart && !lastHyphenStart {
|
if flagHyphenStart && !lastHyphenStart {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
prediction = append(prediction, flag)
|
||||||
if match.Prefix(flag, a.Last) {
|
|
||||||
prediction = append(prediction, flag)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,10 +8,11 @@ package complete
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/posener/complete/cmd"
|
"github.com/posener/complete/cmd"
|
||||||
|
"github.com/posener/complete/match"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -23,6 +24,7 @@ const (
|
||||||
type Complete struct {
|
type Complete struct {
|
||||||
Command Command
|
Command Command
|
||||||
cmd.CLI
|
cmd.CLI
|
||||||
|
Out io.Writer
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new complete command.
|
// New creates a new complete command.
|
||||||
|
@ -34,6 +36,7 @@ func New(name string, command Command) *Complete {
|
||||||
return &Complete{
|
return &Complete{
|
||||||
Command: command,
|
Command: command,
|
||||||
CLI: cmd.CLI{Name: name},
|
CLI: cmd.CLI{Name: name},
|
||||||
|
Out: os.Stdout,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,28 +62,34 @@ func (c *Complete) Complete() bool {
|
||||||
return c.CLI.Run()
|
return c.CLI.Run()
|
||||||
}
|
}
|
||||||
Log("Completing line: %s", line)
|
Log("Completing line: %s", line)
|
||||||
|
|
||||||
a := newArgs(line)
|
a := newArgs(line)
|
||||||
|
Log("Completing last field: %s", a.Last)
|
||||||
options := c.Command.Predict(a)
|
options := c.Command.Predict(a)
|
||||||
|
Log("Options: %s", options)
|
||||||
|
|
||||||
Log("Completion: %s", options)
|
// filter only options that match the last argument
|
||||||
output(options)
|
matches := []string{}
|
||||||
|
for _, option := range options {
|
||||||
|
if match.Prefix(option, a.Last) {
|
||||||
|
matches = append(matches, option)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Log("Matches: %s", matches)
|
||||||
|
c.output(matches)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func getLine() ([]string, bool) {
|
func getLine() (string, bool) {
|
||||||
line := os.Getenv(envComplete)
|
line := os.Getenv(envComplete)
|
||||||
if line == "" {
|
if line == "" {
|
||||||
return nil, false
|
return "", false
|
||||||
}
|
}
|
||||||
return strings.Split(line, " "), true
|
return line, true
|
||||||
}
|
}
|
||||||
|
|
||||||
func output(options []string) {
|
func (c *Complete) output(options []string) {
|
||||||
Log("")
|
|
||||||
// stdout of program defines the complete options
|
// stdout of program defines the complete options
|
||||||
for _, option := range options {
|
for _, option := range options {
|
||||||
fmt.Println(option)
|
fmt.Fprintln(c.Out, option)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package complete
|
package complete
|
||||||
|
|
||||||
import "github.com/posener/complete/match"
|
|
||||||
|
|
||||||
// PredictSet expects specific set of terms, given in the options argument.
|
// PredictSet expects specific set of terms, given in the options argument.
|
||||||
func PredictSet(options ...string) Predictor {
|
func PredictSet(options ...string) Predictor {
|
||||||
return predictSet(options)
|
return predictSet(options)
|
||||||
|
@ -9,11 +7,6 @@ func PredictSet(options ...string) Predictor {
|
||||||
|
|
||||||
type predictSet []string
|
type predictSet []string
|
||||||
|
|
||||||
func (p predictSet) Predict(a Args) (prediction []string) {
|
func (p predictSet) Predict(a Args) []string {
|
||||||
for _, m := range p {
|
return p
|
||||||
if match.Prefix(m, a.Last) {
|
|
||||||
prediction = append(prediction, m)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,10 +76,7 @@
|
||||||
{"path":"github.com/mitchellh/reflectwalk","checksumSHA1":"mrqMlK6gqe//WsJSrJ1HgkPM0lM=","revision":"eecf4c70c626c7cfbb95c90195bc34d386c74ac6","revisionTime":"2015-05-27T15:31:53Z"},
|
{"path":"github.com/mitchellh/reflectwalk","checksumSHA1":"mrqMlK6gqe//WsJSrJ1HgkPM0lM=","revision":"eecf4c70c626c7cfbb95c90195bc34d386c74ac6","revisionTime":"2015-05-27T15:31:53Z"},
|
||||||
{"path":"github.com/pascaldekloe/goe/verify","checksumSHA1":"5h+ERzHw3Rl2G0kFPxoJzxiA9s0=","revision":"07ebd1e2481f616a278ab431cf04cc5cf5ab3ebe","revisionTime":"2017-03-28T18:37:59Z"},
|
{"path":"github.com/pascaldekloe/goe/verify","checksumSHA1":"5h+ERzHw3Rl2G0kFPxoJzxiA9s0=","revision":"07ebd1e2481f616a278ab431cf04cc5cf5ab3ebe","revisionTime":"2017-03-28T18:37:59Z"},
|
||||||
{"path":"github.com/pkg/errors","checksumSHA1":"ynJSWoF6v+3zMnh9R0QmmG6iGV8=","revision":"ff09b135c25aae272398c51a07235b90a75aa4f0","revisionTime":"2017-03-16T20:15:38Z","tree":true},
|
{"path":"github.com/pkg/errors","checksumSHA1":"ynJSWoF6v+3zMnh9R0QmmG6iGV8=","revision":"ff09b135c25aae272398c51a07235b90a75aa4f0","revisionTime":"2017-03-16T20:15:38Z","tree":true},
|
||||||
{"path":"github.com/posener/complete","checksumSHA1":"rTNABfFJ9wtLQRH8uYNkEZGQOrY=","revision":"9f41f7636a724791a3b8b1d35e84caa1124f0d3c","revisionTime":"2017-08-29T17:11:12Z"},
|
{"path":"github.com/posener/complete","checksumSHA1":"Nt4Ol6ZM2n0XD5zatxjwEYBpQnw=","revision":"dc2bc5a81accba8782bebea28628224643a8286a","revisionTime":"2017-11-04T09:57:02Z","version":"=v1.1","versionExact":"v1.1"},
|
||||||
{"path":"github.com/posener/complete/cmd","checksumSHA1":"NB7uVS0/BJDmNu68vPAlbrq4TME=","revision":"9f41f7636a724791a3b8b1d35e84caa1124f0d3c","revisionTime":"2017-08-29T17:11:12Z"},
|
|
||||||
{"path":"github.com/posener/complete/cmd/install","checksumSHA1":"gSX86Xl0w9hvtntdT8h23DZtSag=","revision":"9f41f7636a724791a3b8b1d35e84caa1124f0d3c","revisionTime":"2017-08-29T17:11:12Z"},
|
|
||||||
{"path":"github.com/posener/complete/match","checksumSHA1":"DMo94FwJAm9ZCYCiYdJU2+bh4no=","revision":"9f41f7636a724791a3b8b1d35e84caa1124f0d3c","revisionTime":"2017-08-29T17:11:12Z"},
|
|
||||||
{"path":"github.com/ryanuber/columnize","checksumSHA1":"ExnVEVNT8APpFTm26cUb5T09yR4=","comment":"v2.0.1-8-g983d3a5","revision":"9b3edd62028f107d7cabb19353292afd29311a4e","revisionTime":"2016-07-12T16:32:29Z"},
|
{"path":"github.com/ryanuber/columnize","checksumSHA1":"ExnVEVNT8APpFTm26cUb5T09yR4=","comment":"v2.0.1-8-g983d3a5","revision":"9b3edd62028f107d7cabb19353292afd29311a4e","revisionTime":"2016-07-12T16:32:29Z"},
|
||||||
{"path":"github.com/sean-/seed","checksumSHA1":"A/YUMbGg1LHIeK2+NLZBt+MIAao=","revision":"3c72d44db0c567f7c901f9c5da5fe68392227750","revisionTime":"2017-02-08T16:47:21Z"},
|
{"path":"github.com/sean-/seed","checksumSHA1":"A/YUMbGg1LHIeK2+NLZBt+MIAao=","revision":"3c72d44db0c567f7c901f9c5da5fe68392227750","revisionTime":"2017-02-08T16:47:21Z"},
|
||||||
{"path":"github.com/sergi/go-diff/diffmatchpatch","checksumSHA1":"v7C+aJ1D/z3MEeCte6bxvpoGjM4=","revision":"feef008d51ad2b3778f85d387ccf91735543008d","revisionTime":"2017-04-09T07:17:39Z"},
|
{"path":"github.com/sergi/go-diff/diffmatchpatch","checksumSHA1":"v7C+aJ1D/z3MEeCte6bxvpoGjM4=","revision":"feef008d51ad2b3778f85d387ccf91735543008d","revisionTime":"2017-04-09T07:17:39Z"},
|
||||||
|
|
Loading…
Reference in New Issue