Move the cursor to the beginning before printing right prompt #8011
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
This makes the right prompt position independent of the width of the commandline, which prevents staircase effects. That means, with "X" standing in as a character that the terminal and fish disagree on: ``` > echo X rightprompt ``` will stay like that instead of creating a staircase like ``` > echo X rightpromp t> echo X rightpromp pt> echo X ``` and so on. The cursor still won't be *correct*, but it will be wrong in a less annoying way.
|
Weirdly enough this now means it works better with a right prompt. I'm not completely sure why, it's possible we remove a dependency on "current_width" for something more. Just unconditionally doing the move back to 0 before the right prompt improves things also for situations without a right prompt. I imagine that's probably too chatty, so maybe once before the right prompt and once after the last line? |
|
LGTM! |
This helps with width issues when no right prompt is used.
|
Merged with an additional move after printing everything, which appears to make fish almost usable with broken width. |
aborodin
added a commit
to MidnightCommander/mc
that referenced
this pull request
Jul 3, 2021
Fish 3.3.0 sends \r while printing prompt and mc erases prompt buffer. This change was introduced by fish-shell/fish-shell#8011. (parse_subshell_prompt_string): modify subshell promt parsing. First, skip trailing EOL (\n and \r). Then find previous EOL (if it exists). Get a part of subshell prompt between those EOLs and use it as MC prompt. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This makes the right prompt position independent of the width of the
commandline, which prevents staircase effects. That means, with "X"
standing in as a character that the terminal and fish disagree on:
will stay like that instead of creating a staircase like
and so on.
The cursor still won't be correct, but it will be wrong in a less
annoying way.
A screenshot:
Here fish and gnome-terminal disagree on the width of
☆(U+2606 WHITE STAR). The first shell has the staircase effect, the second has this patch applied.The cursor is still wrong - the final line has
echo ☆123, and the cursor is logically after the 3. However, that's much less annoying than the staircase.The cost of this is one cursor move to the start (a
\r, typically) and longer move to the right prompt per printing of the right prompt, which should be acceptable.TODOs: