h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-03 06:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Run fish_indent on all our fish scripts

Browse Source 
It's now good enough to do so.

We don't allow grid-alignment:

```fish
complete -c foo -s b -l barnanana -a '(something)'
complete -c foo -s z              -a '(something)'
```

becomes

```fish
complete -c foo -s b -l barnanana -a '(something)'
complete -c foo -s z -a '(something)'
```

It's just more trouble than it is worth.

The one part I'd change:

We align and/or'd parts of an if-condition with the in-block code:

```fish
if true
   and false
    dosomething
end
```

becomes

```fish
if true
    and false
    dosomething
end
```

but it's not used terribly much and if we ever fix it we can just
reindent.
This commit is contained in:
Fabian Homborg
2020-01-13 20:34:22 +01:00
parent 31e6ae0099
commit 69b464bc37
36 changed files with 1322 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
share/functions/help.fish
View File

@@ -67,8 +67,8 @@ function help --description 'Show help for the fish shell'
# If the OS appears to be Windows (graphical), try to use cygstart
if type -q cygstart
set fish_browser cygstart
# If xdg-open is available, just use that
# but only if an X session is running
# If xdg-open is available, just use that
# but only if an X session is running
else if type -q xdg-open; and set -q -x DISPLAY
set fish_browser xdg-open
end
@@ -78,7 +78,7 @@ function help --description 'Show help for the fish shell'
# We use this instead of xdg-open because that's useless without a backend
# like wsl-open which we'll check in a minute.
if not type -q cygstart
and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
# Use the first of these.
set fish_browser $cmd[1]
end
@@ -99,7 +99,7 @@ function help --description 'Show help for the fish shell'
# only if a Windows browser is to be used.
if type -q cygstart
if test $fish_browser != "cygstart"
and not command -sq $fish_browser[1]
and not command -sq $fish_browser[1]
# Escaped quotes are necessary to work with spaces in the path
# when the command is finally eval'd.
set fish_browser cygstart $fish_browser
@@ -145,10 +145,10 @@ function help --description 'Show help for the fish shell'
# For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
# but only if a Windows browser is being used
if type -q cygpath
and string match -qr "cygstart" $fish_browser[1]
and string match -qr "cygstart" $fish_browser[1]
set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
else if type -q wslpath
and string match -qr '.exe' $fish_browser[1]
and string match -qr '.exe' $fish_browser[1]
set page_url file://(wslpath -w $__fish_help_dir)/$fish_help_page
end
else
@@ -174,10 +174,10 @@ function help --description 'Show help for the fish shell'
# For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
# but only if a Windows browser is being used
if type -q cygpath
and string match -qr "cygstart" $fish_browser[1]
and string match -qr "cygstart" $fish_browser[1]
set page_url file://(cygpath -m $tmpname)
else if type -q wslpath
and string match -qr '.exe' $fish_browser[1]
and string match -qr '.exe' $fish_browser[1]
set page_url file://(wslpath -w $tmpname)
end
end
@@ -194,7 +194,8 @@ function help --description 'Show help for the fish shell'
case '*'
printf (_ 'help: Help is being displayed in %s.\n') $fish_browser[1]
end
$fish_browser $page_url &; disown
$fish_browser $page_url &
disown
else
# Work around lynx bug where <div class="contents"> always has the same formatting as links (unreadable)
# by using a custom style sheet. See https://github.com/fish-shell/fish-shell/issues/4170