Code review response v2

Author: TrevorVonSeggern

UnitsNet.Tests/UnitParserTests.cs

@@ -44,30 +44,24 @@ public void Parse_ReturnsUnitMappedByCustomAbbreviation(string customAbbreviatio
         [Fact]
         public void Parse_AbbreviationCaseInsensitive_Lowercase_years()
         {
-            // Arrange
             var abbreviation = "years";
             var expected = DurationUnit.Year365;
             var parser = UnitParser.Default;
 
-            // Act
             var actual = parser.Parse<DurationUnit>(abbreviation);
 
-            // Assert
             Assert.Equal(expected, actual);
         }
 
         [Fact]
         public void Parse_AbbreviationCaseInsensitive_Uppercase_Years()
         {
-            // Arrange
             var abbreviation = "Years";
             var expected = DurationUnit.Year365;
             var parser = UnitParser.Default;
 
-            // Act
             var actual = parser.Parse<DurationUnit>(abbreviation);
 
-            // Assert
             Assert.Equal(expected, actual);
         }
 

UnitsNet/CustomCode/UnitValueAbbreviationLookup.cs

@@ -63,20 +63,22 @@ internal List<string> GetAbbreviationsForUnit(int unit)
 
         internal List<int> GetUnitsForAbbreviation(string abbreviation)
         {
-            return abbreviationToUnitMap
-                .Where(x => x.Key.Equals(abbreviation, StringComparison.OrdinalIgnoreCase))
-                .SelectMany(x => x.Value)
-                .Distinct()
-                .ToList();
+            abbreviation = abbreviation.ToLower();
+            if(!abbreviationToUnitMap.TryGetValue(abbreviation, out var units))
+                abbreviationToUnitMap[abbreviation] = units = new List<int>();
+
+            return units.Distinct().ToList();
         }
 
         internal void Add(int unit, string abbreviation, bool setAsDefault = false)
         {
+            // abbreviation = abbreviation.ToLower();
+            var lower = abbreviation.ToLower();
             if(!unitToAbbreviationMap.TryGetValue(unit, out var abbreviationsForUnit))
                 abbreviationsForUnit = unitToAbbreviationMap[unit] = new List<string>();
 
-            if(!abbreviationToUnitMap.TryGetValue(abbreviation, out var unitsForAbbreviation))
-                abbreviationToUnitMap[abbreviation] = unitsForAbbreviation = new List<int>();
+            if(!abbreviationToUnitMap.TryGetValue(lower, out var unitsForAbbreviation))
+                abbreviationToUnitMap[lower] = unitsForAbbreviation = new List<int>();
 
             abbreviationsForUnit.Remove(abbreviation);
             unitsForAbbreviation.Remove(unit);

UnitsNet/UnitConverter.cs

@@ -45,13 +45,13 @@ public static class UnitConverter
         private static readonly string UnitTypeNamespace = typeof(LengthUnit).Namespace;
         private static readonly Assembly UnitsNetAssembly = typeof(Length).GetAssembly();
 
-        private static readonly List<Type> QuantityTypes = UnitsNetAssembly.GetTypes()
+        private static readonly Type[] QuantityTypes = UnitsNetAssembly.GetTypes()
             .Where(x => x.FullName.StartsWith(QuantityNamespace))
-            .ToList();
+            .ToArray();
 
-        private static readonly List<Type> UnitTypes = UnitsNetAssembly.GetTypes()
+        private static readonly Type[] UnitTypes = UnitsNetAssembly.GetTypes()
             .Where(x => x.FullName.StartsWith(UnitTypeNamespace))
-            .ToList();
+            .ToArray();
 
         /// <summary>
         ///     Convert between any two quantity units by their names, such as converting a "Length" of N "Meter" to "Centimeter".