From b735e9dbfd22fc7d35472fcaba18b1a6f7b43d1c Mon Sep 17 00:00:00 2001
From: Chris Rudolphi <1702962+clrudolphi@users.noreply.github.com>
Date: Fri, 19 Aug 2022 13:57:53 -0500
Subject: [PATCH] #2626 Code Cleanup for PR

Modified location of variable declaration in EnumerableValueRetriever to make the code cleaner.
Added this change to the changelog.txt
---
 .../Assist/ValueRetrievers/EnumerableValueRetriever.cs         | 3 +--
 changelog.txt                                                  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TechTalk.SpecFlow/Assist/ValueRetrievers/EnumerableValueRetriever.cs b/TechTalk.SpecFlow/Assist/ValueRetrievers/EnumerableValueRetriever.cs
index 362aa83c5..a310184dd 100644
--- a/TechTalk.SpecFlow/Assist/ValueRetrievers/EnumerableValueRetriever.cs
+++ b/TechTalk.SpecFlow/Assist/ValueRetrievers/EnumerableValueRetriever.cs
@@ -36,11 +36,10 @@ public object Retrieve(KeyValuePair<string, string> keyValuePair, Type targetTyp
 
         private IEnumerable GetItems(string[] strings, KeyValuePair<string, string> keyValuePair, Type targetType, Type itemType)
         {
-            IValueRetriever retriever = null;
             foreach (var splitValue in strings)
             {
                 var itemKeyValuePair = new KeyValuePair<string, string>(keyValuePair.Key, splitValue.Trim());
-                retriever = GetValueRetriever(itemKeyValuePair, targetType, itemType);
+                var retriever = GetValueRetriever(itemKeyValuePair, targetType, itemType);
                 yield return retriever?.Retrieve(itemKeyValuePair, targetType, itemType);
             }
         }
diff --git a/changelog.txt b/changelog.txt
index 023b5739b..5ae7fb78f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@ Features:
 
 Fixes:
 + Support [TableAliases] also outside `CreateInstance`&`CreateSet`. Fixes #1384
++ EnumerableValueRetriever resolves a ValueRetriever for each element in the enumeration instead of reusing the ValueRetriever of the first item in the list. Fixes #2626
 
 3.9.58