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

diffedit blank lines on Windows #4635

Closed
farnoy opened this issue Oct 13, 2024 · 2 comments · Fixed by #4639
Closed

diffedit blank lines on Windows #4635

farnoy opened this issue Oct 13, 2024 · 2 comments · Fixed by #4639
Labels
scm-record Issues relating to the scm-record library, used as the default interactive diff/merge editor.

Comments

@farnoy
Copy link
Contributor

farnoy commented Oct 13, 2024

Description

Lines are disappearing as you scroll through them in diffedit

Steps to Reproduce the Problem

  1. jj diffedit
  2. Scroll down with down arrow

Expected Behavior

Lines should display as normal, just with selection indicated as a background color

Actual Behavior

image (after unfolding the section and scrolling down twice)

Resizing the window does re-draw it and content is restored to the empty lines, but never to the line currently selected. Could be something to do with rendering the background highlight?

Specifications

  • Platform: Windows
  • Version: 0.22.0-67c2ae0a9e3e445f034a456b299e3f37c4dc4b93

Tried it on cmd.exe, Windows Terminal and alacritty, powershell and cmd.exe, I don't think this is anything to do with my environment.

@PhilipMetzger PhilipMetzger added the scm-record Issues relating to the scm-record library, used as the default interactive diff/merge editor. label Oct 13, 2024
@arxanas
Copy link
Contributor

arxanas commented Oct 13, 2024

I'd guess it's caused by carriage returns rather than Windows itself (the lines are not entirely empty, as the newline icon has been rendered in the first column, immediately after what I suppose was a carriage return), and fixed by arxanas/scm-record@b2f18d5 and associated PR. This version (v0.4.0) was recently released and just needs to be bumped in jj, if you want to do it.

@farnoy
Copy link
Contributor Author

farnoy commented Oct 14, 2024

I've had issues trying to build jj last time I tried, but let me have a stab at it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scm-record Issues relating to the scm-record library, used as the default interactive diff/merge editor.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants