mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-11-04 00:11:04 +00:00 
			
		
		
		
	* update github.com/alecthomas/chroma v0.8.0 -> v0.8.1 * github.com/blevesearch/bleve v1.0.10 -> v1.0.12 * editorconfig-core-go v2.1.1 -> v2.3.7 * github.com/gliderlabs/ssh v0.2.2 -> v0.3.1 * migrate editorconfig.ParseBytes to Parse * github.com/shurcooL/vfsgen to 0d455de96546 * github.com/go-git/go-git/v5 v5.1.0 -> v5.2.0 * github.com/google/uuid v1.1.1 -> v1.1.2 * github.com/huandu/xstrings v1.3.0 -> v1.3.2 * github.com/klauspost/compress v1.10.11 -> v1.11.1 * github.com/markbates/goth v1.61.2 -> v1.65.0 * github.com/mattn/go-sqlite3 v1.14.0 -> v1.14.4 * github.com/mholt/archiver v3.3.0 -> v3.3.2 * github.com/microcosm-cc/bluemonday 4f7140c49acb -> v1.0.4 * github.com/minio/minio-go v7.0.4 -> v7.0.5 * github.com/olivere/elastic v7.0.9 -> v7.0.20 * github.com/urfave/cli v1.20.0 -> v1.22.4 * github.com/prometheus/client_golang v1.1.0 -> v1.8.0 * github.com/xanzy/go-gitlab v0.37.0 -> v0.38.1 * mvdan.cc/xurls v2.1.0 -> v2.2.0 Co-authored-by: Lauris BH <lauris@nix.lv>
		
			
				
	
	
		
			94 lines
		
	
	
	
		
			2.4 KiB
		
	
	
	
		
			Go
		
	
	
	
		
			Vendored
		
	
	
	
			
		
		
	
	
			94 lines
		
	
	
	
		
			2.4 KiB
		
	
	
	
		
			Go
		
	
	
	
		
			Vendored
		
	
	
	
package cli
 | 
						|
 | 
						|
import (
 | 
						|
	"flag"
 | 
						|
	"strings"
 | 
						|
)
 | 
						|
 | 
						|
type iterativeParser interface {
 | 
						|
	newFlagSet() (*flag.FlagSet, error)
 | 
						|
	useShortOptionHandling() bool
 | 
						|
}
 | 
						|
 | 
						|
// To enable short-option handling (e.g., "-it" vs "-i -t") we have to
 | 
						|
// iteratively catch parsing errors. This way we achieve LR parsing without
 | 
						|
// transforming any arguments. Otherwise, there is no way we can discriminate
 | 
						|
// combined short options from common arguments that should be left untouched.
 | 
						|
// Pass `shellComplete` to continue parsing options on failure during shell
 | 
						|
// completion when, the user-supplied options may be incomplete.
 | 
						|
func parseIter(set *flag.FlagSet, ip iterativeParser, args []string, shellComplete bool) error {
 | 
						|
	for {
 | 
						|
		err := set.Parse(args)
 | 
						|
		if !ip.useShortOptionHandling() || err == nil {
 | 
						|
			if shellComplete {
 | 
						|
				return nil
 | 
						|
			}
 | 
						|
			return err
 | 
						|
		}
 | 
						|
 | 
						|
		errStr := err.Error()
 | 
						|
		trimmed := strings.TrimPrefix(errStr, "flag provided but not defined: -")
 | 
						|
		if errStr == trimmed {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
 | 
						|
		// regenerate the initial args with the split short opts
 | 
						|
		argsWereSplit := false
 | 
						|
		for i, arg := range args {
 | 
						|
			// skip args that are not part of the error message
 | 
						|
			if name := strings.TrimLeft(arg, "-"); name != trimmed {
 | 
						|
				continue
 | 
						|
			}
 | 
						|
 | 
						|
			// if we can't split, the error was accurate
 | 
						|
			shortOpts := splitShortOptions(set, arg)
 | 
						|
			if len(shortOpts) == 1 {
 | 
						|
				return err
 | 
						|
			}
 | 
						|
 | 
						|
			// swap current argument with the split version
 | 
						|
			args = append(args[:i], append(shortOpts, args[i+1:]...)...)
 | 
						|
			argsWereSplit = true
 | 
						|
			break
 | 
						|
		}
 | 
						|
 | 
						|
		// This should be an impossible to reach code path, but in case the arg
 | 
						|
		// splitting failed to happen, this will prevent infinite loops
 | 
						|
		if !argsWereSplit {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
 | 
						|
		// Since custom parsing failed, replace the flag set before retrying
 | 
						|
		newSet, err := ip.newFlagSet()
 | 
						|
		if err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		*set = *newSet
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func splitShortOptions(set *flag.FlagSet, arg string) []string {
 | 
						|
	shortFlagsExist := func(s string) bool {
 | 
						|
		for _, c := range s[1:] {
 | 
						|
			if f := set.Lookup(string(c)); f == nil {
 | 
						|
				return false
 | 
						|
			}
 | 
						|
		}
 | 
						|
		return true
 | 
						|
	}
 | 
						|
 | 
						|
	if !isSplittable(arg) || !shortFlagsExist(arg) {
 | 
						|
		return []string{arg}
 | 
						|
	}
 | 
						|
 | 
						|
	separated := make([]string, 0, len(arg)-1)
 | 
						|
	for _, flagChar := range arg[1:] {
 | 
						|
		separated = append(separated, "-"+string(flagChar))
 | 
						|
	}
 | 
						|
 | 
						|
	return separated
 | 
						|
}
 | 
						|
 | 
						|
func isSplittable(flagArg string) bool {
 | 
						|
	return strings.HasPrefix(flagArg, "-") && !strings.HasPrefix(flagArg, "--") && len(flagArg) > 2
 | 
						|
}
 |