Skip to content

Commit 8850dbf

Browse files
tmilnthorptmilnthorp
authored
Deprecate plural Molarity units (#1030)
1 parent 947a32a commit 8850dbf

246 files changed

Lines changed: 3946 additions & 3654 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ private void GenerateConversionProperties()
124124
");
125125
foreach (var unit in _quantity.Units)
126126
{
127+
if(unit.SkipConversionGeneration)
128+
continue;
129+
127130
Writer.WL($@"
128131
/// <summary>
129132
/// Get {_quantity.Name} in {unit.PluralName}.
@@ -146,6 +149,9 @@ private void GenerateStaticFactoryMethods()
146149
");
147150
foreach (var unit in _quantity.Units)
148151
{
152+
if(unit.SkipConversionGeneration)
153+
continue;
154+
149155
var valueParamName = unit.PluralName.ToLowerInvariant();
150156
Writer.WL($@"
151157
/// <summary>

‎CodeGen/Generators/NanoFrameworkGen/UnitTypeGenerator.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public enum {_unitEnumName}
4646
/// <remarks>{unit.XmlDocRemarks}</remarks>");
4747
}
4848

49-
Writer.WLIfText(2, UnitsNetGen.QuantityGenerator.GetObsoleteAttributeOrNull(unit));
49+
Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit.ObsoleteText));
5050
Writer.WL($@"
5151
{unit.SingularName},");
5252
}
@@ -58,5 +58,10 @@ public enum {_unitEnumName}
5858
}}");
5959
return Writer.ToString();
6060
}
61+
62+
private string? GetObsoleteAttributeOrNull(string obsoleteText) =>
63+
string.IsNullOrWhiteSpace(obsoleteText) ?
64+
null :
65+
$"[System.Obsolete(\"{obsoleteText}\")]";
6166
}
6267
}

‎CodeGen/Generators/QuantityJsonFilesParser.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed under MIT No Attribution, see LICENSE file at the root.
1+
// Licensed under MIT No Attribution, see LICENSE file at the root.
22
// Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
33

44
using System;
@@ -94,8 +94,11 @@ private static void AddPrefixUnits(Quantity quantity)
9494
BaseUnits = null, // Can we determine this somehow?
9595
FromBaseToUnitFunc = $"({unit.FromBaseToUnitFunc}) / {prefixInfo.Factor}",
9696
FromUnitToBaseFunc = $"({unit.FromUnitToBaseFunc}) * {prefixInfo.Factor}",
97-
Localization = GetLocalizationForPrefixUnit(unit.Localization, prefixInfo)
98-
});
97+
Localization = GetLocalizationForPrefixUnit(unit.Localization, prefixInfo),
98+
ObsoleteText = unit.ObsoleteText,
99+
SkipConversionGeneration = unit.SkipConversionGeneration,
100+
AllowAbbreviationLookup = unit.AllowAbbreviationLookup
101+
} );
99102
}
100103
catch (Exception e)
101104
{

‎CodeGen/Generators/UnitsNetGen/NumberExtensionsGenerator.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public static class NumberTo{_quantityName}Extensions
3737

3838
foreach (var unit in _units)
3939
{
40+
if(unit.SkipConversionGeneration)
41+
continue;
42+
4043
Writer.WL(2, $@"
4144
/// <inheritdoc cref=""{_quantityName}.From{unit.PluralName}(UnitsNet.QuantityValue)"" />");
4245

@@ -55,6 +58,6 @@ public static class NumberTo{_quantityName}Extensions
5558
private static string? GetObsoleteAttributeOrNull(string obsoleteText) =>
5659
string.IsNullOrWhiteSpace(obsoleteText) ?
5760
null :
58-
$"[System.Obsolete(\"{obsoleteText}\")]";
61+
$"[Obsolete(\"{obsoleteText}\")]";
5962
}
6063
}

‎CodeGen/Generators/UnitsNetGen/NumberExtensionsTestClassGenerator.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public class NumberTo{_quantityName}ExtensionsTests
3333

3434
foreach (var unit in _units)
3535
{
36+
if(unit.SkipConversionGeneration)
37+
continue;
38+
3639
Writer.WL(2, $@"
3740
[Fact]");
3841

@@ -48,9 +51,9 @@ public class NumberTo{_quantityName}ExtensionsTests
4851
return Writer.ToString();
4952
}
5053

51-
private string GetObsoleteAttributeOrNull(string obsoleteText) =>
54+
private string? GetObsoleteAttributeOrNull(string obsoleteText) =>
5255
string.IsNullOrWhiteSpace(obsoleteText) ?
5356
null :
54-
$"[System.Obsolete({obsoleteText})]";
57+
$"[Obsolete(\"{obsoleteText}\")]";
5558
}
5659
}

‎CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,9 @@ private void GenerateConversionProperties()
334334
");
335335
foreach (var unit in _quantity.Units)
336336
{
337+
if(unit.SkipConversionGeneration)
338+
continue;
339+
337340
Writer.WL($@"
338341
/// <summary>
339342
/// Get {_quantity.Name} in {unit.PluralName}.
@@ -406,7 +409,7 @@ internal static void MapGeneratedLocalizations(UnitAbbreviationsCache unitAbbrev
406409
$@"""""";
407410
408411
Writer.WL($@"
409-
unitAbbreviationsCache.MapUnitToAbbreviation({_unitEnumName}.{unit.SingularName}, new CultureInfo(""{localization.Culture}""), new string[]{{{abbreviationParams}}});");
412+
unitAbbreviationsCache.PerformAbbreviationMapping({_unitEnumName}.{unit.SingularName}, new CultureInfo(""{localization.Culture}""), false, {unit.AllowAbbreviationLookup.ToString().ToLower()}, new string[]{{{abbreviationParams}}});");
410413
}
411414
}
412415

@@ -445,6 +448,9 @@ private void GenerateStaticFactoryMethods()
445448
");
446449
foreach (var unit in _quantity.Units)
447450
{
451+
if(unit.SkipConversionGeneration)
452+
continue;
453+
448454
var valueParamName = unit.PluralName.ToLowerInvariant();
449455
Writer.WL($@"
450456
/// <summary>
@@ -1227,6 +1233,6 @@ ulong IConvertible.ToUInt64(IFormatProvider provider)
12271233
/// </summary>
12281234
private static string? GetObsoleteAttributeOrNull(string obsoleteText) => string.IsNullOrWhiteSpace(obsoleteText)
12291235
? null
1230-
: $"[System.Obsolete(\"{obsoleteText}\")]";
1236+
: $"[Obsolete(\"{obsoleteText}\")]";
12311237
}
12321238
}

‎CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,27 @@ namespace UnitsNet.Tests
9696
// ReSharper disable once PartialTypeWithSinglePart
9797
public abstract partial class {_quantity.Name}TestsBase : QuantityTestsBase
9898
{{");
99-
foreach(var unit in _quantity.Units) Writer.WL($@"
99+
foreach (var unit in _quantity.Units)
100+
{
101+
if(unit.SkipConversionGeneration)
102+
continue;
103+
104+
Writer.WL($@"
100105
protected abstract double {unit.PluralName}InOne{_baseUnit.SingularName} {{ get; }}");
106+
}
101107

102108
Writer.WL("");
103109
Writer.WL($@"
104110
// ReSharper disable VirtualMemberNeverOverriden.Global");
105-
foreach(var unit in _quantity.Units) Writer.WL($@"
106-
protected virtual double {unit.PluralName}Tolerance {{ get {{ return 1e-5; }} }}"); Writer.WL($@"
111+
foreach (var unit in _quantity.Units)
112+
{
113+
if(unit.SkipConversionGeneration)
114+
continue;
115+
116+
Writer.WL($@"
117+
protected virtual double {unit.PluralName}Tolerance {{ get {{ return 1e-5; }} }}");
118+
}
119+
Writer.WL($@"
107120
// ReSharper restore VirtualMemberNeverOverriden.Global
108121
109122
protected (double UnitsInBaseUnit, double Tolerence) GetConversionFactor({_unitEnumName} unit)

‎CodeGen/Generators/UnitsNetGen/UnitTypeGenerator.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public enum {_unitEnumName}
4545
/// <remarks>{unit.XmlDocRemarks}</remarks>");
4646
}
4747

48-
Writer.WLIfText(2, QuantityGenerator.GetObsoleteAttributeOrNull(unit));
48+
Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit.ObsoleteText));
4949
Writer.WL($@"
5050
{unit.SingularName},");
5151
}
@@ -57,5 +57,10 @@ public enum {_unitEnumName}
5757
}}");
5858
return Writer.ToString();
5959
}
60+
61+
private string? GetObsoleteAttributeOrNull(string obsoleteText) =>
62+
string.IsNullOrWhiteSpace(obsoleteText) ?
63+
null :
64+
$"[System.Obsolete(\"{obsoleteText}\")]";
6065
}
6166
}

‎CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ private void GenerateConversionProperties()
259259
");
260260
foreach (var unit in _quantity.Units)
261261
{
262+
if(unit.SkipConversionGeneration)
263+
continue;
264+
262265
Writer.WL($@"
263266
/// <summary>
264267
/// Get {_quantity.Name} in {unit.PluralName}.
@@ -293,7 +296,7 @@ internal static void MapGeneratedLocalizations(UnitAbbreviationsCache unitAbbrev
293296
$@"""""";
294297
295298
Writer.WL($@"
296-
unitAbbreviationsCache.MapUnitToAbbreviation({_unitEnumName}.{unit.SingularName}, new CultureInfo(""{localization.Culture}""), new string[]{{{abbreviationParams}}});");
299+
unitAbbreviationsCache.PerformAbbreviationMapping({_unitEnumName}.{unit.SingularName}, new CultureInfo(""{localization.Culture}""), false, {unit.AllowAbbreviationLookup.ToString().ToLower()}, new string[]{{{abbreviationParams}}});");
297300
}
298301
}
299302

@@ -333,6 +336,9 @@ private void GenerateStaticFactoryMethods()
333336
");
334337
foreach (var unit in _quantity.Units)
335338
{
339+
if(unit.SkipConversionGeneration)
340+
continue;
341+
336342
var valueParamName = unit.PluralName.ToLowerInvariant();
337343
Writer.WL($@"
338344
/// <summary>
@@ -770,6 +776,6 @@ public string ToString([CanBeNull] string cultureName, [NotNull] string format,
770776
/// </summary>
771777
private static string? GetObsoleteAttributeOrNull(string obsoleteText) => string.IsNullOrWhiteSpace(obsoleteText)
772778
? null
773-
: $"[System.Obsolete(\"{obsoleteText}\")]";
779+
: $"[Obsolete(\"{obsoleteText}\")]";
774780
}
775781
}

‎CodeGen/Generators/UnitsNetWrcGen/UnitTypeGenerator.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using CodeGen.Helpers;
1+
using CodeGen.Helpers;
22
using CodeGen.JsonTypes;
33

44
namespace CodeGen.Generators.UnitsNetWrcGen
@@ -45,7 +45,7 @@ public enum {_unitEnumName}
4545
/// <remarks>{unit.XmlDocRemarks}</remarks>");
4646
}
4747

48-
Writer.WLIfText(2, UnitsNetGen.QuantityGenerator.GetObsoleteAttributeOrNull(unit));
48+
Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit.ObsoleteText));
4949
Writer.WL($@"
5050
{unit.SingularName},");
5151
}
@@ -57,5 +57,10 @@ public enum {_unitEnumName}
5757
}}");
5858
return Writer.ToString();
5959
}
60+
61+
private string? GetObsoleteAttributeOrNull(string obsoleteText) =>
62+
string.IsNullOrWhiteSpace(obsoleteText) ?
63+
null :
64+
$"[System.Obsolete(\"{obsoleteText}\")]";
6065
}
6166
}

0 commit comments

Comments
 (0)