Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better inline height display #2600

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

fzakaria
Copy link

Pulled from #2543 Fixes interactive mode in fish where the terminal wasn't being displayed properly.

fixes #1289

Co-authored-by: Lucas Trzesniewski

I will note that this seems to draw over-top the current prompt which seems to be different than what things like fzf do.
here are two photos to constrat:

I think it would better to draw it below the current prompt to match the style of fzf but at least it does fix the corrupted prompt of #1289

Screenshot From 2025-02-25 19-15-52
Screenshot From 2025-02-25 19-15-31

Checks

  • I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle
  • I have checked that there are no existing pull requests for the same thing

Pulled from atuinsh#2543
Fixes interactive mode in fish where the terminal wasn't being displayed properly.

fixes atuinsh#1289

Co-authored-by: Lucas Trzesniewski
@ltrzesniewski
Copy link

A few notes:

I will note that this seems to draw over-top the current prompt which seems to be different than what things like fzf do.

I'm not sure if Atuin should add a new line or if each script should handle that separately. Note that I added a similar env var ATUIN_POWERSHELL_PROMPT_OFFSET in #2543 but that adds an Y offset when atuin search returns, not when it starts, and it's handled by the PowerShell script, not by Atuin itself.

In any case, that would need a separate issue to discuss the way it should be implemented I suppose, and testing in all of the shells.

Rust / format (pull_request) Failing after 14s

You need to remove the spaces under the new code block for cargo fmt to be successful, or use the tool itself to reformat the code.

Co-authored-by: Lucas Trzesniewski

You'd need to add the following footer to the commit in order for GitHub to take it into account (it needs the e-mail address inside the <>, see the example there). In my case, it's my-first-name.my-last-name@gmail.com:

Co-authored-by: Lucas Trzesniewski <lucas.my-last-name@gmail.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

In fish with inline_height set, the prompt line is intersected by the first line of atuin
2 participants