Code cleanup.

StockSharp · Nov 7, 2024 · 565e7e7 · 565e7e7
1 parent 7281c20
commit 565e7e7
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 25 deletions.
diff --git a/Collections/CachedSynchronizedDictionary.cs b/Collections/CachedSynchronizedDictionary.cs
@@ -31,7 +31,7 @@ public TKey[] CachedKeys
 			get
 			{
 				lock (SyncRoot)
-					return _cachedKeys ??= Keys.ToArray();
+					return _cachedKeys ??= [.. Keys];
 			}
 		}
 
@@ -42,7 +42,7 @@ public TValue[] CachedValues
 			get
 			{
 				lock (SyncRoot)
-					return _cachedValues ??= Values.ToArray();
+					return _cachedValues ??= [.. Values];
 			}
 		}
 
@@ -53,7 +53,7 @@ public KeyValuePair<TKey, TValue>[] CachedPairs
 			get
 			{
 				lock (SyncRoot)
-					return _cachedPairs ??= this.ToArray();
+					return _cachedPairs ??= [.. this];
 			}
 		}
 

diff --git a/Collections/CachedSynchronizedList.cs b/Collections/CachedSynchronizedList.cs
@@ -20,7 +20,7 @@ public T[] Cache
 			get
 			{
 				lock (SyncRoot)
-					return _cache ??= this.ToArray();
+					return _cache ??= [.. this];
 			}
 		}
 

diff --git a/Collections/CachedSynchronizedOrderedDictionary.cs b/Collections/CachedSynchronizedOrderedDictionary.cs
@@ -27,7 +27,7 @@ public TKey[] CachedKeys
 			get
 			{
 				lock (SyncRoot)
-					return _cachedKeys ??= Keys.ToArray();
+					return _cachedKeys ??= [.. Keys];
 			}
 		}
 
@@ -38,7 +38,7 @@ public TValue[] CachedValues
 			get
 			{
 				lock (SyncRoot)
-					return _cachedValues ??= Values.ToArray();
+					return _cachedValues ??= [.. Values];
 			}
 		}
 
@@ -49,7 +49,7 @@ public KeyValuePair<TKey, TValue>[] CachedPairs
 			get
 			{
 				lock (SyncRoot)
-					return _cachedPairs ??= this.ToArray();
+					return _cachedPairs ??= [.. this];
 			}
 		}
 

diff --git a/Collections/CachedSynchronizedPairSet.cs b/Collections/CachedSynchronizedPairSet.cs
@@ -26,7 +26,7 @@ public TKey[] CachedKeys
 			get
 			{
 				lock (SyncRoot)
-					return _cachedKeys ??= Keys.ToArray();
+					return _cachedKeys ??= [.. Keys];
 			}
 		}
 
@@ -37,7 +37,7 @@ public TValue[] CachedValues
 			get
 			{
 				lock (SyncRoot)
-					return _cachedValues ??= Values.ToArray();
+					return _cachedValues ??= [.. Values];
 			}
 		}
 
@@ -48,7 +48,7 @@ public KeyValuePair<TKey, TValue>[] CachedPairs
 			get
 			{
 				lock (SyncRoot)
-					return _cachedPairs ??= this.ToArray();
+					return _cachedPairs ??= [.. this];
 			}
 		}
 

diff --git a/Collections/CachedSynchronizedSet.cs b/Collections/CachedSynchronizedSet.cs
@@ -46,7 +46,7 @@ public T[] Cache
 			get
 			{
 				lock (SyncRoot)
-					return _cache ??= this.ToArray();
+					return _cache ??= [.. this];
 			}
 		}
 

diff --git a/Collections/CollectionHelper.cs b/Collections/CollectionHelper.cs
@@ -1024,7 +1024,7 @@ public static bool[] ToBits(this long value, int startBit, int bitCount)
 			if ((startBit + bitCount) > 32)
 				bits.AddRange(ints[1].ToBits((startBit - 32).Max(0), (bitCount - 32)));
 
-			return bits.ToArray();
+			return [.. bits];
 		}
 
 		public static bool[] ToBits(this int value)

diff --git a/Collections/OrderedPriorityQueue.cs b/Collections/OrderedPriorityQueue.cs
@@ -182,7 +182,7 @@ public void RemoveRange(IEnumerable<KeyValuePair<TPriority, TValue>> items)
 
 			foreach (var g in groups)
 			{
-				Remove(g.Key, g.ToList());
+				Remove(g.Key, [.. g]);
 			}
 		}
 

diff --git a/Common/FastCsvReader.cs b/Common/FastCsvReader.cs
@@ -38,7 +38,7 @@ public FastCsvReader(TextReader reader, string lineSeparator)
 				throw new ArgumentNullException(nameof(lineSeparator));
 
 			Reader = reader ?? throw new ArgumentNullException(nameof(reader));
-			_lineSeparatorChars = lineSeparator.ToArray();
+			_lineSeparatorChars = [.. lineSeparator];
 
 			for (var i = 0; i < _columnPos.Length; i++)
 				_columnPos[i] = new RefPair<int, int>();

diff --git a/Common/FastDateTimeParser.cs b/Common/FastDateTimeParser.cs
@@ -151,7 +151,7 @@ public FastDateTimeParser(string template)
 				};
 			}
 
-			_parts = parts2.ToArray();
+			_parts = [.. parts2];
 
 			//TimeHelper.InitBounds(template, 'y', out _yearStart, out _yearLen);
 			//TimeHelper.InitBounds(template, 'M', out _monthStart, out _monthLen);

diff --git a/Common/FastTimeSpanParser.cs b/Common/FastTimeSpanParser.cs
@@ -122,7 +122,7 @@ public FastTimeSpanParser(string template)
 				};
 			}
 
-			_parts = parts2.ToArray();
+			_parts = [.. parts2];
 
 			//TimeHelper.InitBounds(template, 'd', out _dayStart, out _dayLen);
 			//TimeHelper.InitBounds(template, 'h', out _hourStart, out _hourLen);

diff --git a/Common/TimeZoneConverter/DataLoader.cs b/Common/TimeZoneConverter/DataLoader.cs
@@ -72,7 +72,7 @@ public static void Populate(IDictionary<string, string> ianaMap, IDictionary<str
 
             foreach (var grouping in railsMap.GroupBy(x => x.Value, x => x.Key))
             {
-                inverseRailsMap.Add(grouping.Key, grouping.ToList());
+                inverseRailsMap.Add(grouping.Key, [.. grouping]);
             }
 
             // Expand the Inverse Rails map to include similar IANA zones

diff --git a/Common/TupleHelper.cs b/Common/TupleHelper.cs
@@ -145,7 +145,7 @@ public static object ToTuple(this IEnumerable<object> values, bool isValue)
 			var genericType = $"System.{prefix}Tuple`{types.Count}".To<Type>();
 			var specificType = genericType.Make(types);
 
-			return specificType.CreateInstance(args.ToArray());
+			return specificType.CreateInstance([.. args]);
 		}
 
 		public static IEnumerable<object> ToValues<T>(this T tuple)

diff --git a/ComponentModel/DispatcherObservableCollection.cs b/ComponentModel/DispatcherObservableCollection.cs
@@ -392,7 +392,7 @@ private void OnFlush()
 				lock (SyncRoot)
 				{
 					_isTimerStarted = false;
-					actions = _pendingActions.ToArray();
+					actions = [.. _pendingActions];
 					_pendingActions.Clear();
 				}
 

diff --git a/IO/FossilDelta/Writer.cs b/IO/FossilDelta/Writer.cs
@@ -48,7 +48,7 @@ public unsafe void PutArray (byte* a, int start, int end) {
 
 		public byte[] ToArray ()
 		{
-			return this.a.ToArray();
+			return [.. this.a];
 		}
 
 	}

diff --git a/Linq/AsyncEnumerableExtensions.cs b/Linq/AsyncEnumerableExtensions.cs
@@ -19,7 +19,7 @@ public static async ValueTask<T[]> ToArrayAsync2<T>(this IAsyncEnumerable<T> enu
 		await foreach (var item in enu.WithEnforcedCancellation(cancellationToken))
 			list.Add(item);
 
-		return list.ToArray();
+		return [.. list];
 	}
 
 	public static async ValueTask<T> FirstAsync2<T>(this IAsyncEnumerable<T> enu, CancellationToken cancellationToken)

diff --git a/Net/NetworkHelper.cs b/Net/NetworkHelper.cs
@@ -246,7 +246,7 @@ public static string ClearUrl(this string url)
 			}
 		}
 
-		return new string(chars.ToArray());
+		return new string([.. chars]);
 	}
 
 	public static bool IsUrlSafeChar(this char ch)

diff --git a/Nuget/NugetExtensions.cs b/Nuget/NugetExtensions.cs
@@ -35,7 +35,7 @@ public static string[] GetTargetFrameworks(this PackageArchiveReader reader)
 			targetFrameworks.Add("any");
 		}
 
-		return targetFrameworks.ToArray();
+		return [.. targetFrameworks];
 	}
 
 	public static NuGetFramework RemovePlatformVersion(this NuGetFramework fwk)
@@ -45,7 +45,7 @@ public static async Task<NuGetVersion[]> GetAllVersionsOrderedAsync(this SourceR
 	{
 		var resource = await repo.GetResourceAsync<FindPackageByIdResource>(token);
 
-		return (await resource.GetAllVersionsAsync(packageId, cache, logger, token)).OrderBy(v => v).ToArray();
+		return [.. (await resource.GetAllVersionsAsync(packageId, cache, logger, token)).OrderBy(v => v)];
 	}
 
 	public static async Task<NuGetVersion> GetLastVersionAsync(this SourceRepository repo, string packageId, bool allowPreview, ILogger logger, SourceCacheContext cache, CancellationToken token)

diff --git a/SmartFormat/SmartFormatter.cs b/SmartFormat/SmartFormatter.cs
@@ -65,7 +65,7 @@ public string[] GetNotEmptyFormatterExtensionNames()
             var names = new List<string>();
             foreach (var extension in FormatterExtensions)
                 names.AddRange(extension.Names.Where(n => n != string.Empty).ToArray());
-            return names.ToArray();
+            return [.. names];
         }
 
         /// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ public T[] Cache @@
     			get
     			{
     				lock (SyncRoot)
-    					return _cache ??= this.ToArray();
+    					return _cache ??= [.. this];
     			}
     		}
@@ Expand Down @@