kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-11-14 12:11:12 +03:00
Code Issues Projects Releases Wiki Activity

rg changed its help output to conform more closely to GNU conventions

Browse Source 
Which is good I suppose, but it breaks hyperlinked_greps --help parsing.
I have updated it to match current rg which of course means it fails on
older rg.
This commit is contained in:
Kovid Goyal 2023-11-27 22:08:03 +05:30
parent e19335377f
commit bd7f38eb7d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kittens/hyperlinked_grep/main.go
View File

@ -43,16 +43,18 @@ func get_options_for_rg() (expecting_args map[string]bool, alias_map map[string]
if options_started {
s := strings.TrimLeft(line, " ")
indent := len(line) - len(s)
if indent < 12 && indent > 0 {
s, _, expecting_arg := strings.Cut(s, "<")
if indent < 8 && indent > 0 {
expecting_arg := strings.Contains(s, "=")
single_letter_aliases := make([]string, 0, 1)
long_option_names := make([]string, 0, 1)
for _, x := range strings.Split(s, ",") {
x = strings.TrimSpace(x)
if strings.HasPrefix(x, "--") {
long_option_names = append(long_option_names, x[2:])
lon, _, _ := strings.Cut(x[2:], "=")
long_option_names = append(long_option_names, lon)
} else if strings.HasPrefix(x, "-") {
single_letter_aliases = append(single_letter_aliases, x[1:])
son, _, _ := strings.Cut(x[1:], " ")
single_letter_aliases = append(single_letter_aliases, son)
}
}
if len(long_option_names) == 0 {
@ -68,11 +70,15 @@ func get_options_for_rg() (expecting_args map[string]bool, alias_map map[string]
expecting_args[long_option_names[0]] = expecting_arg
}
} else {
if strings.HasPrefix(line, "OPTIONS:") {
if strings.HasSuffix(line, "OPTIONS:") {
options_started = true
}
}
}
if len(expecting_args) == 0 || len(alias_map) == 0 {
err = fmt.Errorf("Failed to parse rg help output, could not find any options")
return
}
return
}