Test for empty strings using string length

Signed-off-by: nMatveev <nikolayMatveev.job@gmail.com>
ClosedXML · Jun 18, 2020 · 8c1b7ad · 8c1b7ad
1 parent b83be99
commit 8c1b7ad
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,4 +8,7 @@ trim_trailing_whitespace = true
 # 4 space indentation
 [*.cs]
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+# CA1820: Test for empty strings using string length
+dotnet_diagnostic.CA1820.severity = error
diff --git a/ClosedXML/Excel/CalcEngine/CalcEngineHelpers.cs b/ClosedXML/Excel/CalcEngine/CalcEngineHelpers.cs
@@ -44,10 +44,10 @@ internal static bool ValueSatisfiesCriteria(object value, object criteria, CalcE
             else if (criteria is TimeSpan ts) cdbl = ts.TotalDays;
             else if (criteria is String cs)
             {
-                if (value is string && (value as string).Trim() == "")
-                    return cs == "";
+                if (value is string && (value as string).Trim().Length == 0)
+                    return cs.Length == 0;
 
-                if (cs == "")
+                if (cs.Length == 0)
                     return cs.Equals(value);
 
                 // if criteria is an expression (e.g. ">20"), use calc engine

diff --git a/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs b/ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs
@@ -576,7 +576,7 @@ private static object Arabic(List<Expression> p)
 
             try
             {
-                if (input == "")
+                if (input.Length == 0)
                     return 0;
                 if (input == "-")
                     throw new NumberException();

diff --git a/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs b/ClosedXML/Excel/CalcEngine/Functions/XLMath.cs
@@ -120,7 +120,7 @@ public static string ToRoman(int number)
 
         public static int RomanToArabic(string text)
         {
-            if (text == "")
+            if (text.Length == 0)
                 return 0;
             if (text.StartsWith("M", StringComparison.InvariantCultureIgnoreCase))
                 return 1000 + RomanToArabic(text.Substring(1));

diff --git a/ClosedXML/Excel/Cells/XLCell.cs b/ClosedXML/Excel/Cells/XLCell.cs
@@ -1138,13 +1138,13 @@ public XLDataType DataType
                             case DateTime d:
                                 _cellValue = d.ToOADate().ToInvariantString();
 
-                                if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+                                if (style.NumberFormat.Format.Length == 0 && style.NumberFormat.NumberFormatId == 0)
                                     Style.NumberFormat.NumberFormatId = _cellValue.Contains('.') ? 22 : 14;
 
                                 break;
 
                             case TimeSpan ts:
-                                if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+                                if (style.NumberFormat.Format.Length == 0 && style.NumberFormat.NumberFormatId == 0)
                                     Style.NumberFormat.NumberFormatId = 46;
 
                                 break;
@@ -2311,15 +2311,15 @@ private void SetDateTimeFormat(XLStyleValue style, Boolean onlyDatePart)
         {
             _dataType = XLDataType.DateTime;
 
-            if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+            if (style.NumberFormat.Format.Length == 0 && style.NumberFormat.NumberFormatId == 0)
                 Style.NumberFormat.NumberFormatId = onlyDatePart ? 14 : 22;
         }
 
         private void SetTimeSpanFormat(XLStyleValue style)
         {
             _dataType = XLDataType.TimeSpan;
 
-            if (style.NumberFormat.Format == String.Empty && style.NumberFormat.NumberFormatId == 0)
+            if (style.NumberFormat.Format.Length == 0 && style.NumberFormat.NumberFormatId == 0)
                 Style.NumberFormat.NumberFormatId = 46;
         }
 

diff --git a/ClosedXML/XLHelper.cs b/ClosedXML/XLHelper.cs
@@ -277,7 +277,7 @@ private static string Evaluator(Match match, Int32 row, String column)
                 if (split.Length == 1) return column + row; // A1
                 if (split.Length == 3) return match.Groups["one"].Value; // $A$1
                 var a = XLAddress.Create(match.Groups["one"].Value);
-                if (split[0] == String.Empty) return "$" + a.ColumnLetter + row; // $A1
+                if (split[0].Length == 0) return "$" + a.ColumnLetter + row; // $A1
                 return column + "$" + a.RowNumber;
             }
 

diff --git a/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs b/ClosedXML_Tests/Excel/Ranges/MergedRangesTests.cs
@@ -306,7 +306,7 @@ public void UnmergedCellsPreserveStyle()
                 range.Unmerge();
 
                 Assert.IsTrue(range.Cells().All(c => c.Style.Fill.BackgroundColor == XLColor.Red));
-                Assert.IsTrue(range.Cells().Where(c => c != firstCell).All(c => c.Value == ""));
+                Assert.IsTrue(range.Cells().Where(c => c != firstCell).All(c => c.GetString().Length == 0));
                 Assert.AreEqual("B2", firstCell.Value);
 
                 Assert.AreEqual(XLBorderStyleValues.Thick, ws.Cell("B2").Style.Border.TopBorder);