Add SelectAsArrayAsync which does not require a state argument

Author: sharwell

src/Compilers/Core/Portable/Collections/ImmutableArrayExtensions.cs

@@ -289,6 +289,21 @@ public static async ValueTask<ImmutableArray<TResult>> SelectAsArrayAsync<TItem,
             return builder.ToImmutableAndFree();
         }
 
+        /// <summary>
+        /// Maps an immutable array through a function that returns ValueTasks, returning the new ImmutableArray.
+        /// </summary>
+        public static async ValueTask<ImmutableArray<TResult>> SelectAsArrayAsync<TItem, TArg, TResult>(this ImmutableArray<TItem> array, Func<TItem, TArg, CancellationToken, ValueTask<TResult>> selector, TArg arg, CancellationToken cancellationToken)
+        {
+            var builder = ArrayBuilder<TResult>.GetInstance(array.Length);
+
+            foreach (var item in array)
+            {
+                builder.Add(await selector(item, arg, cancellationToken).ConfigureAwait(false));
+            }
+
+            return builder.ToImmutableAndFree();
+        }
+
         public static ValueTask<ImmutableArray<TResult>> SelectManyAsArrayAsync<TItem, TArg, TResult>(this ImmutableArray<TItem> source, Func<TItem, TArg, CancellationToken, ValueTask<ImmutableArray<TResult>>> selector, TArg arg, CancellationToken cancellationToken)
         {
             if (source.Length == 0)

src/Features/Core/Portable/FindUsages/IRemoteFindUsagesService.cs

@@ -249,7 +249,7 @@ public static SerializableDefinitionItem Dehydrate(int id, DefinitionItem item)
 
         public async ValueTask<DefinitionItem.DefaultDefinitionItem> RehydrateAsync(Solution solution, CancellationToken cancellationToken)
         {
-            var sourceSpans = await SourceSpans.SelectAsArrayAsync((ss, cancellationToken) => ss.RehydrateAsync(solution, cancellationToken), cancellationToken).ConfigureAwait(false);
+            var sourceSpans = await SourceSpans.SelectAsArrayAsync(static (ss, solution, cancellationToken) => ss.RehydrateAsync(solution, cancellationToken), solution, cancellationToken).ConfigureAwait(false);
 
             return new DefinitionItem.DefaultDefinitionItem(
                 Tags,

src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs

@@ -394,20 +394,20 @@ private static async ValueTask AddInheritanceMemberItemsForMembersAsync(
             var baseSymbolItems = await baseSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.InheritedInterface,
-                    cancellationToken), cancellationToken)
+                    cancellationToken), solution, cancellationToken)
                 .ConfigureAwait(false);
 
             var derivedTypeItems = await derivedTypesSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(solution,
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(solution,
                     symbol,
                     InheritanceRelationship.ImplementingType,
-                    cancellationToken), cancellationToken)
+                    cancellationToken), solution, cancellationToken)
                 .ConfigureAwait(false);
 
             var nonNullBaseSymbolItems = GetNonNullTargetItems(baseSymbolItems);
@@ -431,11 +431,11 @@ private static async ValueTask AddInheritanceMemberItemsForMembersAsync(
             var implementedMemberItems = await implementingMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.ImplementingMember,
-                    cancellationToken), cancellationToken).ConfigureAwait(false);
+                    cancellationToken), solution, cancellationToken).ConfigureAwait(false);
 
             var nonNullImplementedMemberItems = GetNonNullTargetItems(implementedMemberItems);
             return InheritanceMarginItem.CreateOrdered(
@@ -459,19 +459,19 @@ private static async ValueTask AddInheritanceMemberItemsForMembersAsync(
             var baseSymbolItems = await baseSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     symbol.IsInterfaceType() ? InheritanceRelationship.ImplementedInterface : InheritanceRelationship.BaseType,
-                    cancellationToken), cancellationToken).ConfigureAwait(false);
+                    cancellationToken), solution, cancellationToken).ConfigureAwait(false);
 
             var derivedTypeItems = await derivedTypesSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(solution,
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(solution,
                     symbol,
                     InheritanceRelationship.DerivedType,
-                    cancellationToken), cancellationToken)
+                    cancellationToken), solution, cancellationToken)
                 .ConfigureAwait(false);
 
             var nonNullBaseSymbolItems = GetNonNullTargetItems(baseSymbolItems);
@@ -497,29 +497,29 @@ private static async ValueTask AddInheritanceMemberItemsForMembersAsync(
             var implementedMemberItems = await implementedMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.ImplementedMember,
-                    cancellationToken), cancellationToken).ConfigureAwait(false);
+                    cancellationToken), solution, cancellationToken).ConfigureAwait(false);
 
             var overriddenMemberItems = await overriddenMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.OverriddenMember,
-                    cancellationToken), cancellationToken).ConfigureAwait(false);
+                    cancellationToken), solution, cancellationToken).ConfigureAwait(false);
 
             var overridingMemberItems = await overridingMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
                 .Distinct()
-                .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
+                .SelectAsArrayAsync(static (symbol, solution, cancellationToken) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.OverridingMember,
-                    cancellationToken), cancellationToken).ConfigureAwait(false);
+                    cancellationToken), solution, cancellationToken).ConfigureAwait(false);
 
             var nonNullImplementedMemberItems = GetNonNullTargetItems(implementedMemberItems);
             var nonNullOverriddenMemberItems = GetNonNullTargetItems(overriddenMemberItems);

src/Features/Core/Portable/ValueTracking/ValueTrackingService.cs

@@ -47,7 +47,7 @@ public async Task<ImmutableArray<ValueTrackedItem>> TrackValueSourceAsync(
                 }
 
                 return await result.Value.SelectAsArrayAsync(
-                    (item, cancellationToken) => item.RehydrateAsync(solution, cancellationToken), cancellationToken).ConfigureAwait(false);
+                    static (item, solution, cancellationToken) => item.RehydrateAsync(solution, cancellationToken), solution, cancellationToken).ConfigureAwait(false);
             }
 
             var progressTracker = new ValueTrackingProgressCollector();
@@ -77,7 +77,7 @@ public async Task<ImmutableArray<ValueTrackedItem>> TrackValueSourceAsync(
                 }
 
                 return await result.Value.SelectAsArrayAsync(
-                    (item, cancellationToken) => item.RehydrateAsync(solution, cancellationToken), cancellationToken).ConfigureAwait(false);
+                    static (item, solution, cancellationToken) => item.RehydrateAsync(solution, cancellationToken), solution, cancellationToken).ConfigureAwait(false);
             }
 
             var progressTracker = new ValueTrackingProgressCollector();

src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs

@@ -191,11 +191,11 @@ private async Task<ImmutableArray<TreeItemViewModel>> CalculateChildrenAsync(Can
             var valueTrackedItems = await _valueTrackingService.TrackValueSourceAsync(
                 _solution, _trackedItem, cancellationToken).ConfigureAwait(false);
 
-            return await valueTrackedItems.SelectAsArrayAsync((item, cancellationToken) =>
+            return await valueTrackedItems.SelectAsArrayAsync(static (item, self, cancellationToken) =>
                 CreateAsync(
-                    _solution, item, children: ImmutableArray<TreeItemViewModel>.Empty,
-                    TreeViewModel, _glyphService, _valueTrackingService, _globalOptions,
-                    ThreadingContext, _listener, _threadOperationExecutor, cancellationToken), cancellationToken).ConfigureAwait(false);
+                    self._solution, item, children: ImmutableArray<TreeItemViewModel>.Empty,
+                    self.TreeViewModel, self._glyphService, self._valueTrackingService, self._globalOptions,
+                    self.ThreadingContext, self._listener, self._threadOperationExecutor, cancellationToken), this, cancellationToken).ConfigureAwait(false);
         }
     }
 }