Post-merge

Author: h3xds1nz

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/TraceData.cs

@@ -91,17 +91,18 @@ public static void OnTrace(AvTraceBuilder traceBuilder, ReadOnlySpan<object> par
         {
             for (int i = 0; i < parameters.Length; i++)
             {
-                object o = parameters[i];
+                object objectParam = parameters[i];
                 traceBuilder.Append(" ");
-                if (o is string s)
+
+                if (objectParam is string stringValue)
                 {
-                    traceBuilder.Append(s);
+                    traceBuilder.Append(stringValue);
                 }
-                else if (o != null)
+                else if (objectParam is not null)
                 {
-                    traceBuilder.Append(o.GetType().Name);
+                    traceBuilder.Append(objectParam.GetType().Name);
                     traceBuilder.Append(":");
-                    Describe(traceBuilder, o);
+                    Describe(traceBuilder, objectParam);
                 }
                 else
                 {

src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/AvTrace.cs

@@ -249,12 +249,10 @@ internal static bool IsDebuggerAttached()
         public string Trace(TraceEventType type, int eventId, string message, string[] labels, params ReadOnlySpan<object> parameters)
         {
             // Don't bother building the string if this trace is going to be ignored.
-
-            if (_traceSource == null || !_traceSource.Switch.ShouldTrace(type))
+            if (_traceSource is null || !_traceSource.Switch.ShouldTrace(type))
                 return null;
 
             // Compose the trace string.
-
             AvTraceBuilder traceBuilder = new AvTraceBuilder(AntiFormat(message)); // Holds the format string
             object[] combinedArgs = null; // Holds the combined labels & parameters arrays.
             int formatIndex = 0;
@@ -264,7 +262,7 @@ public string Trace(TraceEventType type, int eventId, string message, string[] l
                 // Create array of pre-computed size
                 int combinedArgsLength = Math.Min(labels.Length - 1, parameters.Length) * 2;
                 if (combinedArgsLength > 0)
-                    combinedArgs = new object[combinedArgsLength];             
+                    combinedArgs = new object[combinedArgsLength];
 
                 int i = 1, j = 0;
                 for (; i < labels.Length && j < parameters.Length; i++, j++)
@@ -278,14 +276,13 @@ public string Trace(TraceEventType type, int eventId, string message, string[] l
 
                     // If the parameter is null, convert to "<null>"; otherwise,
                     // when a string.format is ultimately called it produces bad results.
-                    if (parameters[j] == null)
+                    if (parameters[j] is null)
                     {
                         combinedArgs[j * 2 + 1] = "<null>";
                     }
 
                     // Otherwise, if this is an interesting object, add the hash code and type to
                     // the format string explicitly.
-
                     else if (!SuppressGeneratedParameters
                              && parameters[j].GetType() != typeof(string)
                              && parameters[j] is not ValueType
@@ -296,19 +293,18 @@ public string Trace(TraceEventType type, int eventId, string message, string[] l
                         traceBuilder.Append($"; {labels[i]}.Type='{GetTypeHelper(parameters[j])}'");
 
                         // Add the parameter to the combined list.
-
                         combinedArgs[j * 2 + 1] = parameters[j];
                     }
-                    else // Add the parameter to the combined list.
+                    // Add the parameter to the combined list.
+                    else
                     {
                         combinedArgs[j * 2 + 1] = parameters[j];
                     }
                 }
 
                 // It's OK if we terminate because we have more labels than parameters;
                 // this is used by traces to have out-values in the Stop message.
-
-                if (TraceExtraMessages != null && j < parameters.Length)
+                if (TraceExtraMessages is not null && j < parameters.Length)
                 {
                     TraceExtraMessages(traceBuilder, parameters.Slice(j));
                 }