fix finding get only collection when there is an object defined before the list

Author: jorisdebock

MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTestCases.Designer.cs

@@ -322,4 +322,10 @@
   <data name="_033_ForeachMappingWithDictionary_FIXED" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>TestCaseData\033_ForeachMappingWithDictionary_FIXED.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="_034_ForeachMappingObjectBeforeList" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TestCaseData\034_ForeachMappingObjectBeforeList.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="_034_ForeachMappingObjectBeforeList_FIXED" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TestCaseData\034_ForeachMappingObjectBeforeList_FIXED.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>

MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTestCases.resx

@@ -209,6 +209,12 @@ public void should_be_able_to_use_add_for_get_only_collection_from_dictionary_va
             TestCodeRefactoring(_033_ForeachMappingWithDictionary, _033_ForeachMappingWithDictionary_FIXED);
         }
 
+        [Test]
+        public void should_be_able_to_use_add_for_get_only_collection_with_single_object_before_list()
+        {
+            TestCodeRefactoring(_034_ForeachMappingObjectBeforeList, _034_ForeachMappingObjectBeforeList_FIXED);
+        }
+
         protected override string LanguageName => LanguageNames.CSharp;
 
         protected override CodeRefactoringProvider CreateProvider()

MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTests.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace MappingGenerator.Test.MappingGenerator.TestCaseData
+{
+    public class TestMapper
+    {
+        public static UserDTO [|Map|](UserEntity entity)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class UserDTO
+    {
+        public int Age { get; set; }
+        public AccountDTO Account { get; set; }
+        public List<AccountDTO> Accounts { get; } = new List<AccountDTO>();
+    }
+
+    public class UserEntity
+    {
+        public int Age { get; set; }
+        public AccountEntity Account { get; set; }
+        public List<AccountEntity> Accounts { get; set; }
+    }
+
+    public class AccountDTO
+    {
+        public string BankName { get; set; }
+        public string Number { get; set; }
+    }
+
+    public class AccountEntity
+    {
+        public string BankName { get; set; }
+        public string Number { get; set; }
+    }
+}

MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/TestCaseData/034_ForeachMappingObjectBeforeList.txt

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace MappingGenerator.Test.MappingGenerator.TestCaseData
+{
+    public class TestMapper
+    {
+        public static UserDTO Map(UserEntity entity)
+        {
+            var userDTO = new UserDTO()
+            {
+                Age = entity.Age,
+                Account = new AccountDTO()
+                {
+                    BankName = entity.Account.BankName,
+                    Number = entity.Account.Number
+                }
+            };
+            foreach (var account in entity.Accounts)
+            {
+                var accountDTO = new AccountDTO()
+                {
+                    BankName = account.BankName,
+                    Number = account.Number
+                };
+                userDTO.Accounts.Add(accountDTO);
+            }
+
+            return userDTO;
+        }
+    }
+
+    public class UserDTO
+    {
+        public int Age { get; set; }
+        public AccountDTO Account { get; set; }
+        public List<AccountDTO> Accounts { get; } = new List<AccountDTO>();
+    }
+
+    public class UserEntity
+    {
+        public int Age { get; set; }
+        public AccountEntity Account { get; set; }
+        public List<AccountEntity> Accounts { get; set; }
+    }
+
+    public class AccountDTO
+    {
+        public string BankName { get; set; }
+        public string Number { get; set; }
+    }
+
+    public class AccountEntity
+    {
+        public string BankName { get; set; }
+        public string Number { get; set; }
+    }
+}

MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/TestCaseData/034_ForeachMappingObjectBeforeList_FIXED.txt

@@ -33,12 +33,20 @@ private bool ContainsCollectionWithoutSetter(ITypeSymbol type)
         {
             foreach (var member in type.GetMembers().Where(ObjectHelper.IsPublicPropertySymbol).OfType<IPropertySymbol>())
             {
-                if (ObjectHelper.IsSimpleType(member.Type))
+                if (ObjectHelper.IsSimpleType(member.Type) && !MappingHelper.IsCollection(member.Type))
                 {
                     continue;
                 }
 
-                return member.SetMethod == null && MappingHelper.IsCollection(member.Type) || ContainsCollectionWithoutSetter(MappingHelper.GetElementType(member.Type));
+                if (member.SetMethod == null)
+                {
+                    return true;
+                }
+
+                if (ContainsCollectionWithoutSetter(MappingHelper.GetElementType(member.Type)))
+                {
+                    return true;
+                }
             }
             return false;
         }