Avoid using Linq as it generates GC each time. 1 Format call was gene…

…rating around 2KB.
axuno · Jul 6, 2022 · 90d6660 · 90d6660
1 parent ed610a9
commit 90d6660
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/src/SmartFormat/Core/Parsing/Format.cs b/src/SmartFormat/Core/Parsing/Format.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using SmartFormat.Core.Settings;
 using SmartFormat.Pooling.ObjectPools;
 using SmartFormat.Pooling.SmartPools;
@@ -106,11 +105,12 @@ public void ReturnToPool()
 
         ParentPlaceholder = null;
         HasNested = false;
-            
+
         // Return and clear FormatItems we own
-        foreach (var item in Items.Where(i => ReferenceEquals(this, i.ParentFormatItem)))
+        foreach (var item in Items)
         {
-            ReturnFormatItemToPool(item);
+            if (ReferenceEquals(this, item.ParentFormatItem))
+                ReturnFormatItemToPool(item);
         }
         Items.Clear();
 
@@ -237,9 +237,9 @@ public int IndexOf(char search)
     public int IndexOf(char search, int start)
     {
         start = StartIndex + start;
-        foreach (var item in Items.Where(item => item.EndIndex >= start))
+        foreach (var item in Items)
         {
-            if (item is not LiteralText literalItem) continue;
+            if (item.EndIndex < start || item is not LiteralText literalItem) continue;
 
             if (start < literalItem.StartIndex) start = literalItem.StartIndex;
             var literalIndex =
@@ -420,4 +420,4 @@ public void Dispose()
     }
 
     #endregion
-}
+}
diff --git a/src/SmartFormat/Core/Sources/Source.cs b/src/SmartFormat/Core/Sources/Source.cs
@@ -2,7 +2,6 @@
 // Copyright SmartFormat Project maintainers and contributors.
 // Licensed under the MIT license.
 
-using System.Linq;
 using SmartFormat.Core.Parsing;
 using SmartFormat.Core.Settings;
 
@@ -24,10 +23,7 @@ public abstract class Source : ISource, IInitializer
     protected SmartSettings? _smartSettings;
 
     /// <inheritdoc />
-    public virtual bool TryEvaluateSelector(ISelectorInfo selectorInfo)
-    {
-        return false;
-    }
+    public abstract bool TryEvaluateSelector(ISelectorInfo selectorInfo);
 
     /// <inheritdoc />
     public virtual void Initialize(SmartFormatter smartFormatter)
@@ -48,9 +44,15 @@ public virtual void Initialize(SmartFormatter smartFormatter)
     /// </remarks>
     private bool HasNullableOperator(ISelectorInfo selectorInfo)
     {
-        return _smartSettings != null && selectorInfo.Placeholder != null &&
-               selectorInfo.Placeholder.Selectors.Any(s =>
-                   s.OperatorLength > 1 && s.BaseString[s.OperatorStartIndex] == _smartSettings.Parser.NullableOperator);
+        if (_smartSettings != null && selectorInfo.Placeholder != null)
+        {
+            foreach (var s in selectorInfo.Placeholder.Selectors)
+            {
+                if (s.OperatorLength > 1 && s.BaseString[s.OperatorStartIndex] == _smartSettings.Parser.NullableOperator)
+                    return true;
+            }
+        }
+        return false;
     }
 
     /// <summary>
@@ -77,4 +79,4 @@ protected virtual bool TrySetResultForNullableOperator(ISelectorInfo selectorInf
 
         return false;
     }
-}
+}
diff --git a/src/SmartFormat/Extensions/ListFormatter.cs b/src/SmartFormat/Extensions/ListFormatter.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using SmartFormat.Core.Extensions;
 using SmartFormat.Core.Parsing;
@@ -300,9 +299,15 @@ private static void WriteSpacer(IFormattingInfo formattingInfo, Format spacer, o
     /// </remarks>
     private bool HasNullableOperator(IFormattingInfo formattingInfo)
     {
-        return formattingInfo.Placeholder != null &&
-               formattingInfo.Placeholder.Selectors.Any(s =>
-                   s.OperatorLength > 0 && s.BaseString[s.OperatorStartIndex] == _smartSettings.Parser.NullableOperator);
+        if (formattingInfo.Placeholder != null)
+        {
+            foreach (var s in formattingInfo.Placeholder.Selectors)
+            {
+                if (s.OperatorLength > 0 && s.BaseString[s.OperatorStartIndex] == _smartSettings.Parser.NullableOperator)
+                    return true;
+            }
+        }
+        return false;
     }
 
     ///<inheritdoc />
@@ -312,4 +317,4 @@ public void Initialize(SmartFormatter smartFormatter)
         _smartSettings = smartFormatter.Settings;
         _isInitialized = true;
     }
-}
+}