NLogMessageParameterList - Reduce code complexity for IsValidParamete…

…rList (2nd try) (#334)
NLog · Sep 21, 2019 · 38d3410 · 38d3410
1 parent c6579b5
commit 38d3410
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs b/src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
@@ -93,21 +93,14 @@ private static bool IsValidParameterList(IReadOnlyList<KeyValuePair<string, obje
                 char firstChar = parameterName[0];
                 if (firstChar >= '0' && firstChar <= '9')
                 {
-                    if (!isPositional && i != 0)
-                        isMixedPositional = true;
+                    if (!isPositional)
+                        isMixedPositional = i != 0;
                     isPositional = true;
                 }
                 else
                 {
-                    if (isPositional)
-                    {
-                        isMixedPositional = true;
-                    }
-
-                    if (GetCaptureType(firstChar) != CaptureType.Normal)
-                    {
-                        hasMessageTemplateCapture = true;
-                    }
+                    isMixedPositional = isPositional;
+                    hasMessageTemplateCapture |= GetCaptureType(firstChar) != CaptureType.Normal;
                 }
             }