[FEATURE] Implement hide_flag_count_if_empty_symbol general option #134
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,13 +88,14 @@ func (d *direction) UnmarshalYAML(value *yaml.Node) error { | |
| } | ||
|
|
||
| type options struct { | ||
| BranchMaxLen int `yaml:"branch_max_len"` | ||
| BranchTrim direction `yaml:"branch_trim"` | ||
| Ellipsis string `yaml:"ellipsis"` | ||
| HideClean bool `yaml:"hide_clean"` | ||
| DivergenceSpace bool `yaml:"divergence_space"` | ||
| SwapDivergence bool `yaml:"swap_divergence"` | ||
| FlagsWithoutCount bool `yaml:"flags_without_count"` | ||
| HideFlagCountIfEmptySymbol bool `yaml:"hide_flag_count_if_empty_symbol"` | ||
|
|
||
| } | ||
|
|
||
| // A Formater formats git status to a tmux style string. | ||
|
|
@@ -297,6 +298,15 @@ func (f *Formater) currentRef() string { | |
|
|
||
| // formatFlag formats a flag with or without count based on the flags_without_count option | ||
| func (f *Formater) formatFlag(style, symbol string, count int) string { | ||
| // Handle empty symbol case based on hide_flag_count_if_empty_symbol option | ||
| if symbol == "" { | ||
| if f.Options.HideFlagCountIfEmptySymbol { | ||
| return "" // Hide both symbol and count | ||
| } | ||
| // Show just the count without symbol | ||
| return fmt.Sprintf("%s%d", style, count) | ||
| } | ||
|
|
||
| if f.Options.FlagsWithoutCount { | ||
| return fmt.Sprintf("%s%s", style, symbol) | ||
| } | ||
|
|
@@ -306,37 +316,61 @@ func (f *Formater) formatFlag(style, symbol string, count int) string { | |
| func (f *Formater) flags() string { | ||
| var flags []string | ||
| if f.st.IsClean { | ||
| if f.st.NumStashed != 0 { | ||
| flag := f.formatFlag(f.Styles.Stashed, f.Symbols.Stashed, f.st.NumStashed) | ||
| if flag != "" { | ||
| flags = append(flags, flag) | ||
| } | ||
| } | ||
|
|
||
| if !f.Options.HideClean { | ||
| // Handle clean symbol separately since it doesn't have a count | ||
| if f.Symbols.Clean != "" { | ||
| flags = append(flags, fmt.Sprintf("%s%s", f.Styles.Clean, f.Symbols.Clean)) | ||
| } else if !f.Options.HideFlagCountIfEmptySymbol { | ||
| // When symbol is empty but we don't want to hide, there's no count to show for clean flag | ||
| // so we just skip it (nothing meaningful to display) | ||
| } | ||
| } | ||
|
|
||
| if len(flags) != 0 { | ||
| return f.Styles.Clear + strings.Join(flags, " ") | ||
| } | ||
| } | ||
|
|
||
| if f.st.NumStaged != 0 { | ||
| flag := f.formatFlag(f.Styles.Staged, f.Symbols.Staged, f.st.NumStaged) | ||
| if flag != "" { | ||
| flags = append(flags, flag) | ||
| } | ||
| } | ||
|
|
||
| if f.st.NumConflicts != 0 { | ||
| flag := f.formatFlag(f.Styles.Conflict, f.Symbols.Conflict, f.st.NumConflicts) | ||
| if flag != "" { | ||
| flags = append(flags, flag) | ||
| } | ||
| } | ||
|
|
||
| if f.st.NumModified != 0 { | ||
| flag := f.formatFlag(f.Styles.Modified, f.Symbols.Modified, f.st.NumModified) | ||
| if flag != "" { | ||
| flags = append(flags, flag) | ||
| } | ||
| } | ||
|
|
||
| if f.st.NumStashed != 0 { | ||
| flag := f.formatFlag(f.Styles.Stashed, f.Symbols.Stashed, f.st.NumStashed) | ||
| if flag != "" { | ||
| flags = append(flags, flag) | ||
| } | ||
| } | ||
|
|
||
| if f.st.NumUntracked != 0 { | ||
| flag := f.formatFlag(f.Styles.Untracked, f.Symbols.Untracked, f.st.NumUntracked) | ||
| if flag != "" { | ||
| flags = append(flags, flag) | ||
| } | ||
|
Owner
There was a problem hiding this comment. Code would be much simpler if formatFlag mehod was: It would be called like that for each flag kind: and appendFlag method would take care of handling all cases with both flag-related options
Contributor
Author
There was a problem hiding this comment. Refactored the code to use the suggested |
||
| } | ||
|
|
||
| if len(flags) > 0 { | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.