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

Fix precedence of ui.virtual.whitespace #8879

Merged

Conversation

chtenb
Copy link
Contributor

@chtenb chtenb commented Nov 22, 2023

This fixes the first half of #5675, namely the whitespace case.
This is a patch up from #8750, which was reverted. Sorry for that.

@pascalkuthe pascalkuthe merged commit 8c68074 into helix-editor:master Nov 25, 2023
6 checks passed
@chtenb chtenb deleted the whitespace_highlighting_precedence3 branch November 25, 2023 14:12
@mandx
Copy link
Contributor

mandx commented Nov 25, 2023

I was expecting this PR to fix my issue with indent guides coloring, but looks like it doesn't? I've created #8909 to discuss more.

@the-mikedavis
Copy link
Member

From the description: "This fixes the first half of #5675, namely the whitespace case."

So indent guides are left for future work. Now with #8909 we can close #5675 though.

kirawi pushed a commit to kirawi/helix that referenced this pull request Dec 10, 2023
kirawi pushed a commit to kirawi/helix that referenced this pull request Dec 10, 2023
kirawi added a commit to kirawi/helix that referenced this pull request Jan 10, 2024
dgkf pushed a commit to dgkf/helix that referenced this pull request Jan 30, 2024
* Revert "Revert "Fix precedence of ui.virtual.whitespace (helix-editor#8750)""

This reverts commit 811d62d.

* Fix ui.text overwriting the syntax highlighting

Adjust ui.text description
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.

None yet

5 participants