github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-28 12:13:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Report $PWD changes unconditionally

Browse Source 
Similar to 20bbdb68f (Set terminal title unconditionally, 2024-03-30).

While at it, get rid of a few unnecessary guards (we are never called from
a command substitution, so the check only adds confusion).
This commit is contained in:
Johannes Altmanninger 2024-04-03 12:18:52 +02:00
parent 9870faa8be
commit cb58a30bf2
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@ -42,6 +42,7 @@ Notable backwards-incompatible changes
- If key starts with a raw escape character (``\e``) or a raw ASCII control character (``\c``). - If key starts with a raw escape character (``\e``) or a raw ASCII control character (``\c``).
- If key consists of exactly two characters, contains none of ``,`` or ``-`` and is not a named key. - If key consists of exactly two characters, contains none of ``,`` or ``-`` and is not a named key.
- Fish no longer supports terminals that mishandle OSC or CSI sequences they don't recognize. We are not aware of a need to do so.
- ``random`` now uses a different random number generator and so the values you get even with the same seed have changed. - ``random`` now uses a different random number generator and so the values you get even with the same seed have changed.
Notably, it will now work much more sensibly with very small seeds. Notably, it will now work much more sensibly with very small seeds.
The seed was never guaranteed to give the same result across systems, The seed was never guaranteed to give the same result across systems,
@ -130,7 +131,8 @@ Completions
Improved terminal support Improved terminal support
^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^
- Fish now sets the terminal window title unconditionally (:issue:`10037`). - Fish now reports the working directory (via OSC 7) unconditionally instead of only for some terminals (:issue:`9955`).
- Fish now sets the terminal window title (via OSC 0) unconditionally instead of only for some terminals (:issue:`10037`).
- Focus reporting is enabled unconditionally, not just inside tmux. - Focus reporting is enabled unconditionally, not just inside tmux.
To use it, define functions that handle events ``fish_focus_in`` and ``fish_focus_out``. To use it, define functions that handle events ``fish_focus_in`` and ``fish_focus_out``.
@ -228,7 +230,6 @@ Interactive improvements
- Vi mode now uses :envvar:`fish_cursor_external` to set the cursor shape for external commands (:issue:`4656`). - Vi mode now uses :envvar:`fish_cursor_external` to set the cursor shape for external commands (:issue:`4656`).
- Opening the history search in vi mode switches to insert mode correctly (:issue:`10141`). - Opening the history search in vi mode switches to insert mode correctly (:issue:`10141`).
- Vi mode cursor shaping is now enabled in iTerm2 (:issue:`9698`). - Vi mode cursor shaping is now enabled in iTerm2 (:issue:`9698`).
- Working directory reporting is enabled for iTerm2 (:issue:`9955`).
- Completing commands as root includes commands not owned by root, fixing a regression introduced in fish 3.2.0 (:issue:`9699`). - Completing commands as root includes commands not owned by root, fixing a regression introduced in fish 3.2.0 (:issue:`9699`).
- Selection uses ``fish_color_selection`` for the foreground and background colors, as intended, rather than just the background (:issue:`9717`). - Selection uses ``fish_color_selection`` for the foreground and background colors, as intended, rather than just the background (:issue:`9717`).
- The completion pager will no longer sometimes skip the last entry when moving through a long list (:issue:`9833`). - The completion pager will no longer sometimes skip the last entry when moving through a long list (:issue:`9833`).

22
share/functions/__fish_config_interactive.fish
View File

@ -220,25 +220,11 @@ end" >$__fish_config_dir/config.fish
end end
end end
# Notify terminals when $PWD changes (issue #906). # Notify terminals when $PWD changes via OSC 7 (issue #906).
# VTE based terminals, Terminal.app, iTerm.app, foot, and kitty support this. function __fish_update_cwd_osc --on-variable PWD --description 'Notify terminals when $PWD changes'
if not set -q FISH_UNIT_TESTS_RUNNING printf \e\]7\;file://%s%s\a $hostname (string escape --style=url -- $PWD)
and begin
string match -q -- 'foot*' $TERM
or string match -q -- 'xterm-kitty*' $TERM
or test 0"$VTE_VERSION" -ge 3405
or test "$TERM_PROGRAM" = Apple_Terminal && test (string match -r '\d+' 0"$TERM_PROGRAM_VERSION") -ge 309
or test "$TERM_PROGRAM" = WezTerm
or test "$TERM_PROGRAM" = iTerm.app
end
function __update_cwd_osc --on-variable PWD --description 'Notify capable terminals when $PWD changes'
if status --is-command-substitution
return
end
printf \e\]7\;file://%s%s\a $hostname (string escape --style=url $PWD)
end
__update_cwd_osc # Run once because we might have already inherited a PWD from an old tab
end end
__fish_update_cwd_osc # Run once because we might have already inherited a PWD from an old tab
# Bump this whenever some code below needs to run once when upgrading to a new version. # Bump this whenever some code below needs to run once when upgrading to a new version.
# The universal variable __fish_initialized is initialized in share/config.fish. # The universal variable __fish_initialized is initialized in share/config.fish.