Skip to content

Commit e0fb52e

Browse files
committed
Move PrettifyNamesTrimmer higher up in the class to make it more obvious that it is not the last trimmer
1 parent 68153ff commit e0fb52e

1 file changed

Lines changed: 29 additions & 25 deletions

File tree

sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,35 @@ public void Trim(NameTrimmerContext context)
14801480
}
14811481
}
14821482

1483+
private class PrettifyNamesTrimmer(NamePrettifier namePrettifier) : INameTrimmer
1484+
{
1485+
/// <inheritdoc/>
1486+
public Version Version => new(3, 0);
1487+
1488+
public void Trim(NameTrimmerContext context)
1489+
{
1490+
foreach (var (original, (primary, secondary)) in context.Names)
1491+
{
1492+
// Be lenient about caps for type names (e.g. GL)
1493+
var allowAllCaps = context.Container == null;
1494+
1495+
for (var i = 0; i < secondary.Count; i++)
1496+
{
1497+
secondary[i] = NameUtils.PrefixIfStartsWithNumber(
1498+
namePrettifier.Prettify(secondary[i], allowAllCaps)
1499+
);
1500+
}
1501+
1502+
context.Names[original] = new CandidateNames(
1503+
NameUtils.PrefixIfStartsWithNumber(
1504+
namePrettifier.Prettify(primary, allowAllCaps)
1505+
),
1506+
secondary
1507+
);
1508+
}
1509+
}
1510+
}
1511+
14831512
/// <summary>
14841513
/// Reapplies and transforms identified affixes based on <see cref="NameAffixConfiguration"/>.
14851514
/// </summary>
@@ -1515,29 +1544,4 @@ public void Trim(NameTrimmerContext context)
15151544
}
15161545
}
15171546
}
1518-
1519-
private class PrettifyNamesTrimmer(NamePrettifier namePrettifier) : INameTrimmer
1520-
{
1521-
/// <inheritdoc/>
1522-
public Version Version => new(3, 0);
1523-
1524-
public void Trim(NameTrimmerContext context)
1525-
{
1526-
foreach (var (original, (primary, secondary)) in context.Names)
1527-
{
1528-
// Be lenient about caps for type names (e.g. GL)
1529-
var allowAllCaps = context.Container == null;
1530-
1531-
for (var i = 0; i < secondary.Count; i++)
1532-
{
1533-
secondary[i] = namePrettifier.Prettify(secondary[i], allowAllCaps);
1534-
}
1535-
1536-
context.Names[original] = new CandidateNames(
1537-
namePrettifier.Prettify(primary, allowAllCaps),
1538-
secondary
1539-
);
1540-
}
1541-
}
1542-
}
15431547
}

0 commit comments

Comments
 (0)