Better support for vi-mode indicator #45
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smh
force-pushed
the
fish_mode_prompt
branch
from
fd00c37
to
f6b506f
Compare
|
@rafaelrinaldi no worries. Both rebased now. Love this prompt, but can't live without vi 😄 |
|
@rafaelrinaldi bump |
| @@ -151,7 +151,10 @@ function fish_prompt | |||
| set prompt $prompt $pure_color_gray(basename "$VIRTUAL_ENV")"$pure_color_normal " | |||
| end | |||
|
|
|||
| set prompt $prompt "$color_symbol$pure_symbol_prompt$pure_color_normal " | |||
| # vi-mode indicator | |||
| set mode_indicator (fish_default_mode_prompt) | |||
There was a problem hiding this comment.
Do we have a default value for fish_default_mode_prompt? If not specified, would this break the prompt?
There was a problem hiding this comment.
I believe it is part of fish-shell: https://github.com/fish-shell/fish-shell/blob/master/share/functions/fish_default_mode_prompt.fish
| # vi-mode indicator | ||
| set mode_indicator (fish_default_mode_prompt) | ||
|
|
||
| set prompt $prompt "$mode_indicator$color_symbol$pure_symbol_prompt$pure_color_normal " |
There was a problem hiding this comment.
I guess we could finally isolate this into its own function since we're doing all sorts of things to it now.
No need to do it in this PR, just a note.
|
This looks great to me as is. Merging it in as well. Thanks a lot @smh! |
Closed
edouard-lopez
pushed a commit
that referenced
this pull request
Aug 21, 2023
Better support for vi-mode indicator
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using this prompt with vi keybindings, the mode-indicator is prepended to the first line of the prompt.
This will put the mode-indicator at the start of the second line, before the '❯' character.