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

Change built-in themes to use curly underlines #5419

Merged
merged 3 commits into from
Jan 12, 2023
Merged

Change built-in themes to use curly underlines #5419

merged 3 commits into from
Jan 12, 2023

Conversation

blt-r
Copy link
Contributor

@blt-r blt-r commented Jan 5, 2023

Fixes #5361.
I didn't touch themes that don't underline their diagnostics messages and themes that use underline.style = "line" instead of modifiers = ["underlined"]

@the-mikedavis the-mikedavis added A-theme Area: Theme and appearence related S-waiting-on-review Status: Awaiting review from a maintainer. labels Jan 6, 2023
@pascalkuthe
Copy link
Member

I think this is definitely an improvement. Adding separate colored underlines for diagnostics provides additional information to the user and style wise curly also seems the most appropriate for diagnostics to me.

However I think we usually get the theme author to sign off on theme changes. It's not a hard requirement but it would be good to ping the authors of all themes changed so they have a chance to take a look at the colors you used/offer their input.

@pascalkuthe
Copy link
Member

I think it might also be a good idea to add this to the themelint aswell (found in xtask/src/themelint.rs)

@blt-r
Copy link
Contributor Author

blt-r commented Jan 11, 2023

@enkodr @vv9k @bootradev @ChrHorn @nogden @Rinnray @Yevgnen @CptPotato @AlexanderBrevig @krfl @jbaa @irishmaestro @PORTALSURFER @intarga @zetashift @ramojus @kvrohit @kirawi @WindSoilder @n0s4 @jhscheer @0rphee @jharrilim @raygervais @two-six @nuid32 @erasin @uncomfyhalomacro @vlmutolo @workingj @VuiMuich @p4ymak @atog @paulgraydon @kamek-pf

Hey everyone! Do you mind if I modify your themes to make use of curly and colored underlines for diagnostic messages? (Silence will be interpreted as as "Ok")

@krfl
Copy link
Contributor

krfl commented Jan 11, 2023

Fleet Dark is currently using style = "line" to match the official Fleet editor. If curl is the way forward for all themes, then please go ahead and change it as I do not see fleet dark included in the changes.

@blt-r
Copy link
Contributor Author

blt-r commented Jan 11, 2023

As I said,

I didn't touch themes that don't underline their diagnostics messages and themes that use underline.style = "line" instead of modifiers = ["underlined"]

But now I'll add change Fleet Dark as well

Comment on lines +68 to +71
"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } } # Diagnostics warning (editing area)
"diagnostic.error" = { underline = { color = "red", style = "curl" } } # Diagnostics error (editing area)
"diagnostic.info" = { underline = { color = "blue", style = "curl" } } # Diagnostics info (editing area)
"diagnostic.hint" = { underline = { color = "green", style = "curl" } } # Diagnostics hint (editing area)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm on helix 22.12 (96ff64a8) and with these changes the underline gets the same color of the element it is underlining, e.g. white under white, yellow under yellow. However, it should be red for error, yellow for warning, etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this happen only for this theme?

@zetashift
Copy link
Contributor

Hey everyone! Do you mind if I modify your themes to make use of curly and colored underlines for diagnostic messages? (Silence will be interpreted as as "Ok")

I don't mind, nor do I think kanagawa prescribes underline styles.
Thank you!

@VuiMuich
Copy link
Contributor

VuiMuich commented Jan 11, 2023

Hey everyone! Do you mind if I modify your themes to make use of curly and colored underlines for diagnostic messages? (Silence will be interpreted as as "Ok")

Please go ahead and thanks talking this chore 🙏🏻

@paulgraydon
Copy link
Contributor

Hi! Thanks a lot for doing this change, looks good to me!

@Aethrexal
Copy link
Contributor

Hey everyone! Do you mind if I modify your themes to make use of curly and colored underlines for diagnostic messages? (Silence will be interpreted as as "Ok")

I don't mind at all!
There's already underline to diagnostic messages for Doom Acario dark but maybe it was done wrong.
But thank you! 😄

@WindSoilder
Copy link
Contributor

Hi, just go ahead and make the change :-D

@uncomfyhalomacro
Copy link
Contributor

Sure! I won't mind ☺️

0rphee added a commit to 0rphee/helix-themes that referenced this pull request Jan 11, 2023
based on the changes made by the default versions of the themes in helix-editor/helix#5419
@kvrohit
Copy link
Contributor

kvrohit commented Jan 12, 2023

Sure! Please do. Thank you.

@archseer archseer merged commit c988bd9 into helix-editor:master Jan 12, 2023
@@ -87,7 +87,10 @@
"diff.minus" = "red"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
"diagnostic.error" = { underline = { color = "magenta", style = "curl" } } # maybe should be red?
Copy link
Contributor

@LeoniePhiline LeoniePhiline Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blt-r "magenta" is not defined as a color in this theme, and causes problems. (See #5249)

"red" must be used instead. (See [palette] a few lines down.)

("error" using "magenta" is broken, too.)

Update: I addressed both issues in #5602.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I didn't notice that magenta is not defined, just used whatever "error" used

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. It's fixed now.

kirawi pushed a commit to kirawi/helix that referenced this pull request Jan 25, 2023
* Change built-in themes to use curly underlines

* Change fleet_dark to use curly underlines
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-theme Area: Theme and appearence related S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make diagnostics messages use curly unerline in built-in themes