Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/input/docs/reference/custom-formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ assembly-informational-format: "{Major}.{Minor}.{Patch:F2}-{PreReleaseLabel}"
- `C` or `c` (Currency): `{Major:C}` → `"¤1.00"`
- `P` or `p` (Percent): `{CommitsSinceVersionSource:P}` → `"12,345.60 %"`
- `D` or `d` (Decimal): `{Major:D4}` → `"0001"`
- `B` or `b` (Binary): `{Minor:B4}` → `"0101"`
- `X` or `x` (Hexadecimal): `{Patch:X}` → `"FF"`

### Date and Time Formatting
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GitVersion.Formatting;
using GitVersion.Formatting;

namespace GitVersion.Tests.Formatting;

Expand All @@ -21,6 +21,9 @@ public void TryFormat_NullValue_ReturnsFalse()
[TestCase("1234.5678", "f2", "1234.57")]
[TestCase("1234.5678", "f0", "1235")]
[TestCase("1234.5678", "g", "1234.5678")]
[TestCase("1234", "d8", "00001234")]
[TestCase("1234", "x8", "000004d2")]
[TestCase("12", "b8", "00001100")]
public void TryFormat_ValidFormats_ReturnsExpectedResult(string input, string format, string expected)
{
var sut = new NumericFormatter();
Expand Down
18 changes: 9 additions & 9 deletions src/GitVersion.Core/Formatting/NumericFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ public override bool TryFormat(object? value, string format, CultureInfo culture
return false;

// Integer formatting
if (format.All(char.IsDigit) && int.TryParse(s, NumberStyles.Integer, cultureInfo, out var i))
if (format.All(char.IsDigit) && int.TryParse(s, NumberStyles.Integer, cultureInfo, out var integerValue))
{
result = i.ToString(format, cultureInfo);
result = integerValue.ToString(format, cultureInfo);
return true;
}

// Hexadecimal formatting
if (format.StartsWith("X", StringComparison.OrdinalIgnoreCase) && int.TryParse(s, NumberStyles.Integer, cultureInfo, out var hex))
// Integer formatting with precision specifier
if ("BDX".Contains(char.ToUpperInvariant(format[0])) && int.TryParse(s, NumberStyles.Integer, cultureInfo, out var numericValue))
{
result = hex.ToString(format, cultureInfo);
result = numericValue.ToString(format, cultureInfo);
return true;
}

// Floating point formatting
if ("FEGNCP".Contains(char.ToUpperInvariant(format[0])) && double.TryParse(s, NumberStyles.Float | NumberStyles.AllowThousands, cultureInfo, out var d))
if ("FEGNCP".Contains(char.ToUpperInvariant(format[0])) && double.TryParse(s, NumberStyles.Float | NumberStyles.AllowThousands, cultureInfo, out var floatValue))
{
result = d.ToString(format, cultureInfo);
result = floatValue.ToString(format, cultureInfo);
return true;
}

// Decimal formatting
if (decimal.TryParse(s, NumberStyles.Any, cultureInfo, out var dec))
if (decimal.TryParse(s, NumberStyles.Any, cultureInfo, out var decimalValue))
{
result = dec.ToString(format, cultureInfo);
result = decimalValue.ToString(format, cultureInfo);
return true;
}

Expand Down
Loading