minor

DevTeam · Apr 19, 2021 · 3d0e35c · 3d0e35c
1 parent 676a9e0
commit 3d0e35c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 41 deletions.
diff --git a/IoC.Source/IoC.cs b/IoC.Source/IoC.cs
@@ -5805,7 +5805,6 @@ public static bool TryGetResolver<T>([NotNull] this IContainer container, [NotNu
 #endregion
 #region FluentNativeGetResolver
 
-// ReSharper disable ForCanBeConvertedToForeach
 namespace IoC
 {
     using System;
@@ -5830,9 +5829,8 @@ public static class FluentNativeGetResolver
         public static Resolver<T> GetResolver<T>([NotNull] this Container container)
         {
             var bucket = container.ResolversByType.Buckets[TypeDescriptor<T>.HashCode & container.ResolversByType.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (typeof(T) == item.Key)
                 {
                     return (Resolver<T>)item.Value;
@@ -5879,9 +5877,8 @@ public static Resolver<T> GetResolver<T>([NotNull] this Container container, Tag
         public static Resolver<T> GetResolver<T>([NotNull] this Container container, [NotNull] Type type)
         {
             var bucket = container.ResolversByType.Buckets[type.GetHashCode() & container.ResolversByType.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (type == item.Key)
                 {
                     return (Resolver<T>) item.Value;
@@ -5905,9 +5902,8 @@ public static Resolver<T> GetResolver<T>([NotNull] this Container container, [No
         {
             var key = new Key(type, tag);
             var bucket = container.Resolvers.Buckets[key.GetHashCode() & container.Resolvers.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (key.Equals(item.Key))
                 {
                     return (Resolver<T>)item.Value;
@@ -5922,7 +5918,6 @@ public static Resolver<T> GetResolver<T>([NotNull] this Container container, [No
 #endregion
 #region FluentNativeResolve
 
-// ReSharper disable ForCanBeConvertedToForeach
 namespace IoC
 {
     using System;
@@ -5949,9 +5944,8 @@ public static class FluentNativeResolve
         public static T Resolve<T>([NotNull] this Container container)
         {
             var bucket = container.ResolversByType.Buckets[TypeDescriptor<T>.HashCode & container.ResolversByType.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (typeof(T) == item.Key)
                 {
                     return ((Resolver<T>)item.Value)(container, EmptyArgs);
@@ -8666,7 +8660,7 @@ public Key([NotNull] Type type, [CanBeNull] object tag = null)
         /// <inheritdoc />
         [Pure]
         // ReSharper disable once PossibleNullReferenceException
-        [MethodImpl((MethodImplOptions)0x200)]
+        [MethodImpl((MethodImplOptions)0x300)]
         public override bool Equals(object obj) => this.Equals((Key)obj);
 
         /// <inheritdoc />
@@ -8676,7 +8670,7 @@ public Key([NotNull] Type type, [CanBeNull] object tag = null)
 
         /// <inheritdoc />
         [Pure]
-        [MethodImpl((MethodImplOptions)0x200)]
+        [MethodImpl((MethodImplOptions)0x300)]
         public override int GetHashCode()
         {
             unchecked
@@ -9377,7 +9371,7 @@ public bool TryBuildExpression(IBuildContext buildContext, ILifetime lifetime, o
                         null,
                         ResolveWithTagGenericMethodInfo.MakeGenericMethod(instanceType),
                         context.ContainerParameter,
-                        Expression.Constant(context.Key.Tag),
+                        Expression.Constant(context.Key.Tag).Convert(typeof(object)),
                         context.ArgsParameter);
                 }
 
@@ -13872,7 +13866,7 @@ internal sealed class Table<TKey, TValue>: IEnumerable<Table<TKey, TValue>.KeyVa
         public readonly int Divisor;
         public readonly Bucket[] Buckets;
 
-        public Table(int size)
+        private Table(int size)
             :this(
                 CoreExtensions.CreateArray(size + 1, EmptyBucket),
                 size,
@@ -13922,7 +13916,6 @@ private Table(Table<TKey, TValue> origin, TKey key, TValue value)
         public TValue Get(TKey key)
         {
             var bucket = Buckets[key.GetHashCode() & Divisor];
-            // ReSharper disable once ForCanBeConvertedToForeach
             for (var index = 0; index < bucket.KeyValues.Length; index++)
             {
                 var item = bucket.KeyValues[index];
@@ -14055,10 +14048,8 @@ internal static class TableExtensions
         public static bool TryGetByType<TValue>(this Table<Type, TValue> table, Type key, out TValue value)
         {
             var bucket = table.Buckets[key.GetHashCode() & table.Divisor];
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (var index = 0; index < bucket.KeyValues.Length; index++)
+            foreach (var item in bucket.KeyValues)
             {
-                var item = bucket.KeyValues[index];
                 if (key == item.Key)
                 {
                     value = item.Value;
@@ -14075,10 +14066,8 @@ public static bool TryGetByType<TValue>(this Table<Type, TValue> table, Type key
         public static bool TryGetByKey<TValue>(this Table<Key, TValue> table, Key key, out TValue value)
         {
             var bucket = table.Buckets[key.GetHashCode() & table.Divisor];
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (var index = 0; index < bucket.KeyValues.Length; index++)
+            foreach (var item in bucket.KeyValues)
             {
-                var item = bucket.KeyValues[index];
                 if (key.Equals(item.Key))
                 {
                     value = item.Value;

diff --git a/IoC.sln.DotSettings b/IoC.sln.DotSettings
@@ -195,6 +195,7 @@
 	<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">No</s:String>
 	<s:Int64 x:Key="/Default/Environment/Hierarchy/Build/SolutionBuilderNext/ParallelProcessesCount2/@EntryValue">8</s:Int64>
 	<s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EInteractive_002ECore_002EFilterManagement_002EMigration_002EGlobalFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

diff --git a/IoC/Core/Table.cs b/IoC/Core/Table.cs
@@ -14,7 +14,7 @@ internal sealed class Table<TKey, TValue>: IEnumerable<Table<TKey, TValue>.KeyVa
         public readonly int Divisor;
         public readonly Bucket[] Buckets;
 
-        public Table(int size)
+        private Table(int size)
             :this(
                 CoreExtensions.CreateArray(size + 1, EmptyBucket),
                 size,
@@ -64,7 +64,6 @@ private Table(Table<TKey, TValue> origin, TKey key, TValue value)
         public TValue Get(TKey key)
         {
             var bucket = Buckets[key.GetHashCode() & Divisor];
-            // ReSharper disable once ForCanBeConvertedToForeach
             for (var index = 0; index < bucket.KeyValues.Length; index++)
             {
                 var item = bucket.KeyValues[index];

diff --git a/IoC/Core/TableExtensions.cs b/IoC/Core/TableExtensions.cs
@@ -10,10 +10,8 @@ internal static class TableExtensions
         public static bool TryGetByType<TValue>(this Table<Type, TValue> table, Type key, out TValue value)
         {
             var bucket = table.Buckets[key.GetHashCode() & table.Divisor];
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (var index = 0; index < bucket.KeyValues.Length; index++)
+            foreach (var item in bucket.KeyValues)
             {
-                var item = bucket.KeyValues[index];
                 if (key == item.Key)
                 {
                     value = item.Value;
@@ -30,10 +28,8 @@ public static bool TryGetByType<TValue>(this Table<Type, TValue> table, Type key
         public static bool TryGetByKey<TValue>(this Table<Key, TValue> table, Key key, out TValue value)
         {
             var bucket = table.Buckets[key.GetHashCode() & table.Divisor];
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (var index = 0; index < bucket.KeyValues.Length; index++)
+            foreach (var item in bucket.KeyValues)
             {
-                var item = bucket.KeyValues[index];
                 if (key.Equals(item.Key))
                 {
                     value = item.Value;

diff --git a/IoC/FluentNativeGetResolver.cs b/IoC/FluentNativeGetResolver.cs
@@ -1,5 +1,4 @@
-// ReSharper disable ForCanBeConvertedToForeach
-namespace IoC
+namespace IoC
 {
     using System;
     using System.Runtime.CompilerServices;
@@ -23,9 +22,8 @@ public static class FluentNativeGetResolver
         public static Resolver<T> GetResolver<T>([NotNull] this Container container)
         {
             var bucket = container.ResolversByType.Buckets[TypeDescriptor<T>.HashCode & container.ResolversByType.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (typeof(T) == item.Key)
                 {
                     return (Resolver<T>)item.Value;
@@ -72,9 +70,8 @@ public static Resolver<T> GetResolver<T>([NotNull] this Container container, Tag
         public static Resolver<T> GetResolver<T>([NotNull] this Container container, [NotNull] Type type)
         {
             var bucket = container.ResolversByType.Buckets[type.GetHashCode() & container.ResolversByType.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (type == item.Key)
                 {
                     return (Resolver<T>) item.Value;
@@ -98,9 +95,8 @@ public static Resolver<T> GetResolver<T>([NotNull] this Container container, [No
         {
             var key = new Key(type, tag);
             var bucket = container.Resolvers.Buckets[key.GetHashCode() & container.Resolvers.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (key.Equals(item.Key))
                 {
                     return (Resolver<T>)item.Value;

diff --git a/IoC/FluentNativeResolve.cs b/IoC/FluentNativeResolve.cs
@@ -1,5 +1,4 @@
-// ReSharper disable ForCanBeConvertedToForeach
-namespace IoC
+namespace IoC
 {
     using System;
     using System.Runtime.CompilerServices;
@@ -25,9 +24,8 @@ public static class FluentNativeResolve
         public static T Resolve<T>([NotNull] this Container container)
         {
             var bucket = container.ResolversByType.Buckets[TypeDescriptor<T>.HashCode & container.ResolversByType.Divisor].KeyValues;
-            for (var index = 0; index < bucket.Length; index++)
+            foreach (var item in bucket)
             {
-                var item = bucket[index];
                 if (typeof(T) == item.Key)
                 {
                     return ((Resolver<T>)item.Value)(container, EmptyArgs);