Fixed a few more warnings

Author: Randall Flagg

src/.editorconfig

@@ -89,7 +89,7 @@ dotnet_style_allow_statement_immediately_after_block_experimental = false:warnin
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_elsewhere = true:suggestion
 csharp_style_var_for_built_in_types = true:warning
 csharp_style_var_when_type_is_apparent = true:warning
 
@@ -277,7 +277,7 @@ dotnet_diagnostic.IDE0003.severity = warning
 dotnet_diagnostic.IDE0004.severity = warning
 
 # IDE0005: Remove unnecessary import
-dotnet_diagnostic.IDE0005.severity = warning
+dotnet_diagnostic.IDE0005.severity = none
 
 # IDE0005_gen: Remove unnecessary import (NotConfigurable)
 #dotnet_diagnostic.IDE0005_gen.severity = silent

src/ColumnizerLib/Column.cs

@@ -10,7 +10,15 @@ public class Column : IColumn
     private const int MAXLENGTH = 4678 - 3;
     private const string REPLACEMENT = "...";
 
-    private static readonly IEnumerable<Func<string, string>> _replacements;
+    private static readonly List<Func<string, string>> _replacements = [
+        //replace tab with 3 spaces, from old coding. Needed???
+                input => input.Replace("\t", "  ", StringComparison.Ordinal),
+
+                //shorten string if it exceeds maxLength
+                input => input.Length > MAXLENGTH
+                        ? string.Concat(input.AsSpan(0, MAXLENGTH), REPLACEMENT)
+                        : input
+    ];
 
     private string _fullValue;
 
@@ -20,32 +28,19 @@ public class Column : IColumn
 
     static Column ()
     {
-        var replacements = new List<Func<string, string>>(
-            [
-                //replace tab with 3 spaces, from old coding. Needed???
-                input => input.Replace("\t", "  ", StringComparison.Ordinal),
-
-                //shorten string if it exceeds maxLength
-                input => input.Length > MAXLENGTH
-                        ? string.Concat(input.AsSpan(0, MAXLENGTH), REPLACEMENT)
-                        : input
-            ]);
-
         if (Environment.Version >= Version.Parse("6.2"))
         {
             //Win8 or newer support full UTF8 chars with the preinstalled fonts.
             //Replace null char with UTF8 Symbol U+2400 (␀)
-            replacements.Add(input => input.Replace("\0", "␀", StringComparison.Ordinal));
+            _replacements.Add(input => input.Replace("\0", "␀", StringComparison.Ordinal));
         }
         else
         {
             //Everything below Win8 the installed fonts seems to not to support reliabel
             //Replace null char with space
-            replacements.Add(input => input.Replace("\0", " ", StringComparison.Ordinal));
+            _replacements.Add(input => input.Replace("\0", " ", StringComparison.Ordinal));
         }
 
-        _replacements = replacements;
-
         EmptyColumn = new Column { FullValue = string.Empty };
     }
 
@@ -77,7 +72,7 @@ public string FullValue
 
     public string DisplayValue { get; private set; }
 
-    string ITextValue.Text => DisplayValue;
+    public string Text => DisplayValue;
 
     #endregion
 

src/ColumnizerLib/Extensions/LogLineExtensions.cs

@@ -1,9 +1,11 @@
 namespace LogExpert.Extensions;
 
+//TODO: Move this to LogExpert.UI, change to internal and fix tests
 public static class LogLineExtensions
 {
-    public static string ToClipBoardText(this ILogLine logLine)
+    //TOOD: check if the callers are checking for null before calling
+    public static string ToClipBoardText (this ILogLine logLine)
     {
-        return "\t" + (logLine.LineNumber + 1).ToString() + "\t" + logLine.FullLine;
+        return logLine == null ? string.Empty : $"\t{logLine.LineNumber + 1}\t{logLine.FullLine}";
     }
 }

src/ColumnizerLib/IXmlLogConfiguration.cs

@@ -30,7 +30,7 @@ public interface IXmlLogConfiguration
     /// Example: {"log4j", "http://jakarta.apache.org/log4j"}
     ///
     /// </summary>
-    string[] Namespace { get; }
+    string[] GetNamespaceDeclaration ();
 
     #endregion
 }

src/ColumnizerLib/LineEntry.cs

@@ -1,11 +1,13 @@
+using System;
+
 namespace LogExpert;
 
 /// <summary>
 /// This helper struct holds a log line and its line number (zero based).
 /// This struct is used by <see cref="ILogExpertCallback"/>.
 /// </summary>
 /// <seealso cref="ILogExpertCallback.AddPipedTab"/>
-public struct LineEntry
+public struct LineEntry : IEquatable<LineEntry>
 {
     /// <summary>
     /// The content of the line.
@@ -16,4 +18,22 @@ public struct LineEntry
     /// The line number. See <see cref="ILogExpertCallback.AddPipedTab"/> for an explanation of the line number.
     /// </summary>
     public int LineNum { get; set; }
+
+    public override bool Equals(object obj)
+    {
+        return obj is LineEntry other && Equals(other);
+    }
+
+    public readonly bool Equals(LineEntry other)
+    {
+        return LineNum == other.LineNum && Equals(LogLine, other.LogLine);
+    }
+
+    public override readonly int GetHashCode()
+    {
+        return HashCode.Combine(LineNum, LogLine);
+    }
+
+    public static bool operator == (LineEntry left, LineEntry right) => left.Equals(right);
+    public static bool operator != (LineEntry left, LineEntry right) => !left.Equals(right);
 }

src/GlassfishColumnizer/XmlConfig.cs

@@ -1,4 +1,4 @@
-using LogExpert;
+using LogExpert;
 
 namespace GlassfishColumnizer;
 
@@ -12,7 +12,7 @@ internal class XmlConfig : IXmlLogConfiguration
 
     public string Stylesheet { get; }
 
-    public string[] Namespace => null;
+    public string[] GetNamespaceDeclaration () => null;
 
     #endregion
 }

src/Log4jXmlColumnizer/XmlConfig.cs

@@ -1,4 +1,4 @@
-using LogExpert;
+using LogExpert;
 
 namespace Log4jXmlColumnizer;
 
@@ -26,7 +26,7 @@ internal class XmlConfig : IXmlLogConfiguration
                                         "</xsl:template>" +
                                         "</xsl:stylesheet>";
 
-    public string[] Namespace => ["log4j", "http://jakarta.apache.org/log4j"];
+    public string[] GetNamespaceDeclaration () => ["log4j", "http://jakarta.apache.org/log4j"];
 
     #endregion
 }

src/LogExpert.Core/Classes/DateTimeParser/Token.cs

@@ -4,14 +4,16 @@ namespace LogExpert.Core.Classes.DateTimeParser;
 
 public static class Token
 {
+    //TOOD: check if the callers are checking for null before calling
     public static bool IsDatePart(string token)
     {
+        ArgumentNullException.ThrowIfNull(token);
         return
             token.StartsWith("y", StringComparison.OrdinalIgnoreCase) ||
             token.StartsWith("m", StringComparison.OrdinalIgnoreCase) ||
             token.StartsWith("d", StringComparison.OrdinalIgnoreCase) ||
             token.StartsWith("s", StringComparison.OrdinalIgnoreCase) ||
             token.StartsWith("h", StringComparison.OrdinalIgnoreCase) ||
-            string.Compare(token, "tt", StringComparison.OrdinalIgnoreCase) == 0;
+            token.Equals("tt", StringComparison.OrdinalIgnoreCase);
     }
 }

src/LogExpert.Core/Classes/xml/XmlBlockSplitter.cs

@@ -39,9 +39,10 @@ public XmlBlockSplitter(XmlLogReader reader, IXmlLogConfiguration xmlLogConfig)
         // Create the XmlNamespaceManager.
         NameTable nt = new();
         XmlNamespaceManager nsmgr = new(nt);
-        if (xmlLogConfig.Namespace != null)
+        var namespaceDeclaration = xmlLogConfig.GetNamespaceDeclaration();
+        if (namespaceDeclaration != null)
         {
-            nsmgr.AddNamespace(xmlLogConfig.Namespace[0], xmlLogConfig.Namespace[1]);
+            nsmgr.AddNamespace(namespaceDeclaration[0], namespaceDeclaration[1]);
         }
         // Create the XmlParserContext.
         _context = new XmlParserContext(nt, nsmgr, null, XmlSpace.None);