reduce some nesting from elses (#1414)

Humanizr · Feb 19, 2024 · ae71cc6 · ae71cc6
1 parent 6a861e2
commit ae71cc6
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 162 deletions.
diff --git a/src/Humanizer/DateHumanizeExtensions.cs b/src/Humanizer/DateHumanizeExtensions.cs
@@ -36,10 +36,8 @@ public static string Humanize(this DateTime? input, bool? utcDate = null, DateTi
             {
                 return Humanize(input.Value, utcDate, dateToCompareAgainst, culture);
             }
-            else
-            {
-                return Configurator.GetFormatter(culture).DateHumanize_Never();
-            }
+
+            return Configurator.GetFormatter(culture).DateHumanize_Never();
         }
 
         /// <summary>
@@ -69,10 +67,8 @@ public static string Humanize(this DateTimeOffset? input, DateTimeOffset? dateTo
             {
                 return Humanize(input.Value, dateToCompareAgainst, culture);
             }
-            else
-            {
-                return Configurator.GetFormatter(culture).DateHumanize_Never();
-            }
+
+            return Configurator.GetFormatter(culture).DateHumanize_Never();
         }
 
 #if NET6_0_OR_GREATER
@@ -102,10 +98,8 @@ public static string Humanize(this DateOnly? input, DateOnly? dateToCompareAgain
             {
                 return Humanize(input.Value, dateToCompareAgainst, culture);
             }
-            else
-            {
-                return Configurator.GetFormatter(culture).DateHumanize_Never();
-            }
+
+            return Configurator.GetFormatter(culture).DateHumanize_Never();
         }
 
         /// <summary>
@@ -137,10 +131,8 @@ public static string Humanize(this TimeOnly? input, TimeOnly? timeToCompareAgain
             {
                 return Humanize(input.Value, timeToCompareAgainst, useUtc, culture);
             }
-            else
-            {
-                return Configurator.GetFormatter(culture).DateHumanize_Never();
-            }
+
+            return Configurator.GetFormatter(culture).DateHumanize_Never();
         }
 
 #endif

diff --git a/src/Humanizer/Localisation/NumberToWords/AfrikaansNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/AfrikaansNumberToWordsConverter.cs
@@ -127,19 +127,15 @@ static string GetUnitValue(int number, bool isOrdinal)
                 {
                     return exceptionString;
                 }
-                else if (number > 19)
+
+                if (number > 19)
                 {
                     return TensMap[number / 10] + "ste";
                 }
-                else
-                {
-                    return UnitsMap[number] + "de";
-                }
-            }
-            else
-            {
-                return UnitsMap[number];
+                return UnitsMap[number] + "de";
             }
+
+            return UnitsMap[number];
         }
 
         static string RemoveOnePrefix(string toWords)

diff --git a/src/Humanizer/Localisation/NumberToWords/ArmenianNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/ArmenianNumberToWordsConverter.cs
@@ -154,10 +154,8 @@ static string GetUnitValue(long number, bool isOrdinal)
             {
                 return UnitsMap[number] + "երորդ";
             }
-            else
-            {
-                return UnitsMap[number];
-            }
+
+            return UnitsMap[number];
         }
 
         static string RemoveOnePrefix(string toWords)

diff --git a/src/Humanizer/Localisation/NumberToWords/BulgarianNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/BulgarianNumberToWordsConverter.cs
@@ -161,16 +161,14 @@ static string GetEndingForGender(GrammaticalGender gender, long input)
                     _ => throw new ArgumentOutOfRangeException(nameof(gender))
                 };
             }
-            else
+
+            return gender switch
             {
-                return gender switch
-                {
-                    GrammaticalGender.Masculine => "ен",
-                    GrammaticalGender.Feminine => "на",
-                    GrammaticalGender.Neuter => "но",
-                    _ => throw new ArgumentOutOfRangeException(nameof(gender))
-                };
-            }
+                GrammaticalGender.Masculine => "ен",
+                GrammaticalGender.Feminine => "на",
+                GrammaticalGender.Neuter => "но",
+                _ => throw new ArgumentOutOfRangeException(nameof(gender))
+            };
         }
     }
 }
diff --git a/src/Humanizer/Localisation/NumberToWords/CentralKurdishNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/CentralKurdishNumberToWordsConverter.cs
@@ -58,8 +58,7 @@ public override string Convert(long number)
             var sentence = string.Join(" و ", parts);
             if (sentence.StartsWith("یەک هەزار"))
                 return sentence.Substring(" یەک".Length);
-            else
-                return sentence;
+            return sentence;
         }
 
         public override string ConvertToOrdinal(int number)

diff --git a/src/Humanizer/Localisation/NumberToWords/EnglishNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/EnglishNumberToWordsConverter.cs
@@ -131,15 +131,11 @@ static string GetUnitValue(long number, bool isOrdinal)
                 {
                     return exceptionString;
                 }
-                else
-                {
-                    return UnitsMap[number] + "th";
-                }
-            }
-            else
-            {
-                return UnitsMap[number];
+
+                return UnitsMap[number] + "th";
             }
+
+            return UnitsMap[number];
         }
 
         static string RemoveOnePrefix(string toWords)

diff --git a/src/Humanizer/Localisation/NumberToWords/GreekNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/GreekNumberToWordsConverter.cs
@@ -152,23 +152,24 @@ string ConvertImpl(long number, bool returnPluralized)
             {
                 return ConvertIntB13(number, returnPluralized);
             }
-            else if (number < 100)
+
+            if (number < 100)
             {
                 return ConvertIntBH(number, returnPluralized);
             }
-            else if (number < 1000)
+            if (number < 1000)
             {
                 return ConvertIntBT(number, returnPluralized);
             }
-            else if (number < 1000000)
+            if (number < 1000000)
             {
                 return ConvertIntBM(number);
             }
-            else if (number < 1000000000)
+            if (number < 1000000000)
             {
                 return ConvertIntBB(number);
             }
-            else if (number < 1000000000000)
+            if (number < 1000000000000)
             {
                 return ConvertIntBTR(number);
             }

diff --git a/src/Humanizer/Localisation/NumberToWords/NorwegianBokmalNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/NorwegianBokmalNumberToWordsConverter.cs
@@ -143,19 +143,16 @@ static string GetUnitValue(int number, bool isOrdinal)
                 {
                     return exceptionString;
                 }
-                else if (number < 13)
+
+                if (number < 13)
                 {
                     return UnitsMap[number].TrimEnd('e') + "ende";
                 }
-                else
-                {
-                    return UnitsMap[number] + "de";
-                }
-            }
-            else
-            {
-                return UnitsMap[number];
+
+                return UnitsMap[number] + "de";
             }
+
+            return UnitsMap[number];
         }
 
         static bool ExceptionNumbersToWords(int number, out string words) =>

diff --git a/src/Humanizer/Localisation/NumberToWords/Romanian/RomanianCardinalNumberConverter.cs b/src/Humanizer/Localisation/NumberToWords/Romanian/RomanianCardinalNumberConverter.cs
@@ -254,15 +254,11 @@ static string GetPartByGender(string multiGenderPart, GrammaticalGender gender)
                 {
                     return parts[2];
                 }
-                else
-                {
-                    return parts[0];
-                }
-            }
-            else
-            {
-                return multiGenderPart;
+
+                return parts[0];
             }
+
+            return multiGenderPart;
         }
 
         static bool IsAbove20(int number) =>
@@ -274,14 +270,13 @@ string HundredsToText(int hundreds)
             {
                 return string.Empty;
             }
-            else if (hundreds == 1)
+
+            if (hundreds == 1)
             {
                 return _feminineSingular + " sută";
             }
-            else
-            {
-                return GetPartByGender(_units[hundreds], GrammaticalGender.Feminine) + " sute";
-            }
+
+            return GetPartByGender(_units[hundreds], GrammaticalGender.Feminine) + " sute";
         }
 
         /// <summary>
@@ -305,14 +300,13 @@ string ThousandsConverter(int number, GrammaticalGender gender)
             {
                 return string.Empty;
             }
-            else if (number == 1)
+
+            if (number == 1)
             {
                 return _feminineSingular + " mie";
             }
-            else
-            {
-                return ThreeDigitSetConverter(number, GrammaticalGender.Feminine) + (IsAbove20(number) ? " " + _joinAbove20 : string.Empty) + " mii";
-            }
+
+            return ThreeDigitSetConverter(number, GrammaticalGender.Feminine) + (IsAbove20(number) ? " " + _joinAbove20 : string.Empty) + " mii";
         }
 
         // Large numbers (above 10^6) use a combined form of the long and short scales.
@@ -339,14 +333,13 @@ string MillionsConverter(int number, GrammaticalGender gender)
             {
                 return string.Empty;
             }
-            else if (number == 1)
+
+            if (number == 1)
             {
                 return _masculineSingular + " milion";
             }
-            else
-            {
-                return ThreeDigitSetConverter(number, GrammaticalGender.Feminine) + (IsAbove20(number) ? " " + _joinAbove20 : string.Empty) + " milioane";
-            }
+
+            return ThreeDigitSetConverter(number, GrammaticalGender.Feminine) + (IsAbove20(number) ? " " + _joinAbove20 : string.Empty) + " milioane";
         }
 
         /// <summary>
@@ -361,10 +354,8 @@ string BillionsConverter(int number, GrammaticalGender gender)
             {
                 return _masculineSingular + " miliard";
             }
-            else
-            {
-                return ThreeDigitSetConverter(number, GrammaticalGender.Feminine) + (IsAbove20(number) ? " " + _joinAbove20 : string.Empty) + " miliarde";
-            }
+
+            return ThreeDigitSetConverter(number, GrammaticalGender.Feminine) + (IsAbove20(number) ? " " + _joinAbove20 : string.Empty) + " miliarde";
         }
     }
 }