NLogBeginScopeParser - Reduce complexity of ParseScopeProperties (#657)

snakefoot · web-flow · commit 37d2ee2d4704 · 2023-02-02T16:33:23.000Z
diff --git a/src/NLog.Extensions.Logging/Logging/NLogBeginScopeParser.cs b/src/NLog.Extensions.Logging/Logging/NLogBeginScopeParser.cs
@@ -58,6 +58,8 @@ private IReadOnlyList<KeyValuePair<string, object>> ParseScopeProperties(IReadOn
 
             if (!NLogLogger.OriginalFormatPropertyName.Equals(scopePropertyList[scopePropertyCount - 1].Key))
                 return IncludeActivityIdsProperties(scopePropertyList);
+            else if (scopePropertyCount == 1)
+                return Array.Empty<KeyValuePair<string, object>>();
             else
                 scopePropertyCount -= 1;    // Handle BeginScope("Hello {World}", "Earth")
 
@@ -66,10 +68,6 @@ private IReadOnlyList<KeyValuePair<string, object>> ParseScopeProperties(IReadOn
             {
                 return new[] { firstProperty };
             }
-            else if (scopePropertyCount == 0)
-            {
-                return Array.Empty<KeyValuePair<string, object>>();
-            }
             else
             {
                 var propertyList = new List<KeyValuePair<string, object>>(scopePropertyCount);

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ private IReadOnlyList<KeyValuePair<string, object>> ParseScopeProperties(IReadOn`
`58`	`58`
`59`	`59`	`if (!NLogLogger.OriginalFormatPropertyName.Equals(scopePropertyList[scopePropertyCount - 1].Key))`
`60`	`60`	`return IncludeActivityIdsProperties(scopePropertyList);`
	`61`	`+ else if (scopePropertyCount == 1)`
	`62`	`+ return Array.Empty<KeyValuePair<string, object>>();`
`61`	`63`	`else`
`62`	`64`	`scopePropertyCount -= 1; // Handle BeginScope("Hello {World}", "Earth")`
`63`	`65`
`@@ -66,10 +68,6 @@ private IReadOnlyList<KeyValuePair<string, object>> ParseScopeProperties(IReadOn`
`66`	`68`	`{`
`67`	`69`	`return new[] { firstProperty };`
`68`	`70`	`}`
`69`		`- else if (scopePropertyCount == 0)`
`70`		`- {`
`71`		`- return Array.Empty<KeyValuePair<string, object>>();`
`72`		`- }`
`73`	`71`	`else`
`74`	`72`	`{`
`75`	`73`	`var propertyList = new List<KeyValuePair<string, object>>(scopePropertyCount);`