mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-07-15 00:06:09 +03:00
Revert "bash: remove quoted completions while sorting possible portability issue"
This reverts commit f1728f594a681941b85a8d2fa8a136d625d9b633.
This commit is contained in:
@ -37,6 +37,7 @@ fn writeBashCompletions(writer: anytype) !void {
|
|||||||
const pad4 = pad3 ++ pad1;
|
const pad4 = pad3 ++ pad1;
|
||||||
|
|
||||||
try writer.writeAll(
|
try writer.writeAll(
|
||||||
|
\\
|
||||||
\\# -o nospace requires we add back a space when a completion is finished
|
\\# -o nospace requires we add back a space when a completion is finished
|
||||||
\\# and not part of a --key= completion
|
\\# and not part of a --key= completion
|
||||||
\\addSpaces() {
|
\\addSpaces() {
|
||||||
@ -45,6 +46,40 @@ fn writeBashCompletions(writer: anytype) !void {
|
|||||||
\\ done
|
\\ done
|
||||||
\\}
|
\\}
|
||||||
\\
|
\\
|
||||||
|
\\_fonts() {
|
||||||
|
\\ local IFS=$'\n'
|
||||||
|
\\ mapfile -t COMPREPLY < <( compgen -P '"' -S '"' -W "$($ghostty +list-fonts | grep '^[A-Z]' )" -- "$cur")
|
||||||
|
\\}
|
||||||
|
\\
|
||||||
|
\\_themes() {
|
||||||
|
\\ local IFS=$'\n'
|
||||||
|
\\ mapfile -t COMPREPLY < <( compgen -P '"' -S '"' -W "$($ghostty +list-themes | sed -E 's/^(.*) \(.*$/\1/')" -- "$cur")
|
||||||
|
\\}
|
||||||
|
\\
|
||||||
|
\\_files() {
|
||||||
|
\\ mapfile -t COMPREPLY < <( compgen -o filenames -f -- "$cur" )
|
||||||
|
\\ for i in "${!COMPREPLY[@]}"; do
|
||||||
|
\\ if [[ -d "${COMPREPLY[i]}" ]]; then
|
||||||
|
\\ COMPREPLY[i]="${COMPREPLY[i]}/";
|
||||||
|
\\ fi
|
||||||
|
\\ if [[ -f "${COMPREPLY[i]}" ]]; then
|
||||||
|
\\ COMPREPLY[i]="${COMPREPLY[i]} ";
|
||||||
|
\\ fi
|
||||||
|
\\ done
|
||||||
|
\\}
|
||||||
|
\\
|
||||||
|
\\_dirs() {
|
||||||
|
\\ mapfile -t COMPREPLY < <( compgen -o dirnames -d -- "$cur" )
|
||||||
|
\\ for i in "${!COMPREPLY[@]}"; do
|
||||||
|
\\ if [[ -d "${COMPREPLY[i]}" ]]; then
|
||||||
|
\\ COMPREPLY[i]="${COMPREPLY[i]}/";
|
||||||
|
\\ fi
|
||||||
|
\\ done
|
||||||
|
\\ if [[ "${#COMPREPLY[@]}" == 0 && -d "$cur" ]]; then
|
||||||
|
\\ COMPREPLY=( "$cur " )
|
||||||
|
\\ fi
|
||||||
|
\\}
|
||||||
|
\\
|
||||||
\\config="--help"
|
\\config="--help"
|
||||||
\\config+=" --version"
|
\\config+=" --version"
|
||||||
\\
|
\\
|
||||||
@ -70,13 +105,13 @@ fn writeBashCompletions(writer: anytype) !void {
|
|||||||
try writer.writeAll(pad2 ++ "--" ++ field.name ++ ") ");
|
try writer.writeAll(pad2 ++ "--" ++ field.name ++ ") ");
|
||||||
|
|
||||||
if (std.mem.startsWith(u8, field.name, "font-family"))
|
if (std.mem.startsWith(u8, field.name, "font-family"))
|
||||||
try writer.writeAll("return ;;")
|
try writer.writeAll("_fonts ;;")
|
||||||
else if (std.mem.eql(u8, "theme", field.name))
|
else if (std.mem.eql(u8, "theme", field.name))
|
||||||
try writer.writeAll("return ;;")
|
try writer.writeAll("_themes ;;")
|
||||||
else if (std.mem.eql(u8, "working-directory", field.name))
|
else if (std.mem.eql(u8, "working-directory", field.name))
|
||||||
try writer.writeAll("return ;;")
|
try writer.writeAll("_dirs ;;")
|
||||||
else if (field.type == Config.RepeatablePath)
|
else if (field.type == Config.RepeatablePath)
|
||||||
try writer.writeAll("return ;;")
|
try writer.writeAll("_files ;;")
|
||||||
else {
|
else {
|
||||||
const compgenPrefix = "mapfile -t COMPREPLY < <( compgen -W \"";
|
const compgenPrefix = "mapfile -t COMPREPLY < <( compgen -W \"";
|
||||||
const compgenSuffix = "\" -- \"$cur\" ); addSpaces ;;";
|
const compgenSuffix = "\" -- \"$cur\" ); addSpaces ;;";
|
||||||
@ -206,7 +241,7 @@ fn writeBashCompletions(writer: anytype) !void {
|
|||||||
},
|
},
|
||||||
else => {
|
else => {
|
||||||
if (std.mem.eql(u8, "config-file", opt.name)) {
|
if (std.mem.eql(u8, "config-file", opt.name)) {
|
||||||
try writer.writeAll("return ;;");
|
try writer.writeAll("_files ;;");
|
||||||
} else try writer.writeAll("return;;");
|
} else try writer.writeAll("return;;");
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -254,6 +289,12 @@ fn writeBashCompletions(writer: anytype) !void {
|
|||||||
\\ else prev="${COMP_WORDS[COMP_CWORD-1]}"
|
\\ else prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||||
\\ fi
|
\\ fi
|
||||||
\\
|
\\
|
||||||
|
\\ # current completion is double quoted add a space so the curor progresses
|
||||||
|
\\ if [[ "$2" == \"*\" ]]; then
|
||||||
|
\\ COMPREPLY=( "$cur " );
|
||||||
|
\\ return;
|
||||||
|
\\ fi
|
||||||
|
\\
|
||||||
\\ case "$COMP_CWORD" in
|
\\ case "$COMP_CWORD" in
|
||||||
\\ 1)
|
\\ 1)
|
||||||
\\ case "${COMP_WORDS[1]}" in
|
\\ case "${COMP_WORDS[1]}" in
|
||||||
@ -266,6 +307,12 @@ fn writeBashCompletions(writer: anytype) !void {
|
|||||||
\\ case "$prev" in
|
\\ case "$prev" in
|
||||||
\\ -e | --help | --version) return 0 ;;
|
\\ -e | --help | --version) return 0 ;;
|
||||||
\\ *)
|
\\ *)
|
||||||
|
\\ if [[ "=" != "${COMP_WORDS[COMP_CWORD]}" && $prevWasEq != true ]]; then
|
||||||
|
\\ # must be completing with a space after the key eg: '--<key> '
|
||||||
|
\\ # clear out prev so we don't run any of the key specific completions
|
||||||
|
\\ prev=""
|
||||||
|
\\ fi
|
||||||
|
\\
|
||||||
\\ case "${COMP_WORDS[1]}" in
|
\\ case "${COMP_WORDS[1]}" in
|
||||||
\\ --*) _handleConfig ;;
|
\\ --*) _handleConfig ;;
|
||||||
\\ +*) _handleActions ;;
|
\\ +*) _handleActions ;;
|
||||||
|
Reference in New Issue
Block a user