fix: display theme icons with --color=never option #1591
Conversation
This file contains hidden or 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
WhoSowSee
force-pushed
the
main
branch
3 times, most recently
from
cc296d6 to
5876450
Compare
Previously, when using --color=never, custom icons from theme.yml were not displayed because the icon rendering was coupled with color styling logic. This change separates icon display from color styling by: - Always applying icon glyphs from theme configuration - Only applying color styles when colors are enabled - Preserving existing behavior for all other cases Fixes the issue where --color=never would suppress themed icons while still maintaining proper color control functionality. Tested with custom theme.yml containing file extension and filename icon mappings - icons now display correctly with --color=never.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix: Display theme icons with --color=never option
This commit fixes issues #1590
Problem
When using the
--color=neverflag, custom icons defined intheme.ymlwere not being displayed. This happened because the icon rendering logic was incorrectly coupled with color styling, causing icons to be suppressed when colors were disabled.Root Cause
In
src/theme/ui_styles.rs, theicon_style()method was returning early whenself.use_colourswas false, preventing any icon styling (including non-colored icons) from being applied.Solution
Separated icon display logic from color styling logic:
use_coloursis trueChanges Made
icon_style()method insrc/theme/ui_styles.rstheme.ymlnow display with--color=never--color=alwaysand--color=autoPreview
Before
After