Fix calculating properties visibility which come from external library

cezarypiatek · Oct 21, 2018 · b472faf · b472faf
1 parent 94e5909
commit b472faf
Show file tree

Hide file tree

Showing 9 changed files with 321 additions and 2 deletions.
diff --git a/MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator.Test.csproj b/MappingGenerator/MappingGenerator/MappingGenerator.Test/MappingGenerator.Test.csproj
@@ -42,6 +42,7 @@
 
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.8.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />

diff --git a/...ingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTestCases.Designer.cs b/...ingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTestCases.Designer.cs
diff --git a/...or/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTestCases.resx b/...or/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTestCases.resx
@@ -226,4 +226,16 @@
   <data name="_018_CollectionMappingWithPostfixGenericNameInSingular_FIXED" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>TestCaseData\018_CollectionMappingWithPostfixGenericNameInSingular_FIXED.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="_019_MappingPropertiesInheritedFromLibraryClass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TestCaseData\019_MappingPropertiesInheritedFromLibraryClass.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="_019_MappingPropertiesInheritedFromLibraryClass_FIXED" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TestCaseData\019_MappingPropertiesInheritedFromLibraryClass_FIXED.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="_020_MappingPropertiesInConstructorInheritedFromLibraryClass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TestCaseData\020_MappingPropertiesInConstructorInheritedFromLibraryClass.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="_020_MappingPropertiesInConstructorInheritedFromLibraryClass_FIXED" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>TestCaseData\020_MappingPropertiesInConstructorInheritedFromLibraryClass_FIXED.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
diff --git a/...enerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTests.cs b/...enerator/MappingGenerator/MappingGenerator.Test/MappingGenerator/MappingGeneratorTests.cs
@@ -1,4 +1,6 @@
-using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using NUnit.Framework;
 using RoslynNUnitLight;
@@ -120,11 +122,28 @@ public void should_be_able_to_generate_collection_mapping_with_lambda_parameter_
             TestCodeRefactoring(_018_CollectionMappingWithPostfixGenericNameInSingular, _018_CollectionMappingWithPostfixGenericNameInSingular_FIXED);
         }
 
+        [Test]
+        public void should_be_able_to_map_properties_inherited_from_class_declared_in_external_library()
+        {
+            TestCodeRefactoring(_019_MappingPropertiesInheritedFromLibraryClass, _019_MappingPropertiesInheritedFromLibraryClass_FIXED);
+        }
+
+        [Test]
+        public void should_be_able_to_map_properties_inside_constructor_inherited_from_class_declared_in_external_library()
+        {
+            TestCodeRefactoring(_020_MappingPropertiesInConstructorInheritedFromLibraryClass, _020_MappingPropertiesInConstructorInheritedFromLibraryClass_FIXED);
+        }
+
         protected override string LanguageName => LanguageNames.CSharp;
 
         protected override CodeRefactoringProvider CreateProvider()
         {
             return new MappingGeneratorRefactoring();
         }
+
+        protected override ImmutableList<MetadataReference> References { get => new MetadataReference[]
+        {
+            MetadataReference.CreateFromFile(typeof(IdentityUser).Assembly.Location)
+        }.ToImmutableList();}
     }
 }
diff --git a/...tor.Test/MappingGenerator/TestCaseData/019_MappingPropertiesInheritedFromLibraryClass.txt b/...tor.Test/MappingGenerator/TestCaseData/019_MappingPropertiesInheritedFromLibraryClass.txt
@@ -0,0 +1,37 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using System;
+
+namespace TestAutoMapper
+{
+    public static class ExternalUserTest
+    {
+        public static ApplicationUserEntity [|ToEntity|](this UserModel model)
+        {
+           throw new NotImplementedException();
+        }
+    }
+
+    public class UserModel
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+
+        public virtual string Email { get; set; }
+
+        public virtual bool EmailConfirmed { get; set; }
+
+        public virtual string PasswordHash { get; set; }
+
+        public virtual string SecurityStamp { get; set; }
+
+        public virtual string PhoneNumber { get; set; }
+        public virtual bool PhoneNumberConfirmed { get; set; }
+
+    }
+
+    public  class ApplicationUserEntity: IdentityUser
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+    }
+}
diff --git a/...st/MappingGenerator/TestCaseData/019_MappingPropertiesInheritedFromLibraryClass_FIXED.txt b/...st/MappingGenerator/TestCaseData/019_MappingPropertiesInheritedFromLibraryClass_FIXED.txt
@@ -0,0 +1,47 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using System;
+
+namespace TestAutoMapper
+{
+    public static class ExternalUserTest
+    {
+        public static ApplicationUserEntity ToEntity(this UserModel model)
+        {
+            return new ApplicationUserEntity()
+            {
+                NewProperty1 = model.NewProperty1,
+                NewProperty2 = model.NewProperty2,
+                Email = model.Email,
+                EmailConfirmed = model.EmailConfirmed,
+                PasswordHash = model.PasswordHash,
+                SecurityStamp = model.SecurityStamp,
+                PhoneNumber = model.PhoneNumber,
+                PhoneNumberConfirmed = model.PhoneNumberConfirmed
+            };
+        }
+    }
+
+    public class UserModel
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+
+        public virtual string Email { get; set; }
+
+        public virtual bool EmailConfirmed { get; set; }
+
+        public virtual string PasswordHash { get; set; }
+
+        public virtual string SecurityStamp { get; set; }
+
+        public virtual string PhoneNumber { get; set; }
+        public virtual bool PhoneNumberConfirmed { get; set; }
+
+    }
+
+    public  class ApplicationUserEntity: IdentityUser
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+    }
+}
diff --git a/...ingGenerator/TestCaseData/020_MappingPropertiesInConstructorInheritedFromLibraryClass.txt b/...ingGenerator/TestCaseData/020_MappingPropertiesInConstructorInheritedFromLibraryClass.txt
@@ -0,0 +1,34 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using System;
+
+namespace TestAutoMapper
+{
+    public class UserModel
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+
+        public virtual string Email { get; set; }
+
+        public virtual bool EmailConfirmed { get; set; }
+
+        public virtual string PasswordHash { get; set; }
+
+        public virtual string SecurityStamp { get; set; }
+
+        public virtual string PhoneNumber { get; set; }
+        public virtual bool PhoneNumberConfirmed { get; set; }
+
+    }
+
+    public  class ApplicationUserEntity: IdentityUser
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+
+        public [|ApplicationUserEntity|](UserModel model)
+        {
+           throw new NotImplementedException();
+        }
+    }
+}
diff --git a/...erator/TestCaseData/020_MappingPropertiesInConstructorInheritedFromLibraryClass_FIXED.txt b/...erator/TestCaseData/020_MappingPropertiesInConstructorInheritedFromLibraryClass_FIXED.txt
@@ -0,0 +1,41 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using System;
+
+namespace TestAutoMapper
+{
+    public class UserModel
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+
+        public virtual string Email { get; set; }
+
+        public virtual bool EmailConfirmed { get; set; }
+
+        public virtual string PasswordHash { get; set; }
+
+        public virtual string SecurityStamp { get; set; }
+
+        public virtual string PhoneNumber { get; set; }
+        public virtual bool PhoneNumberConfirmed { get; set; }
+
+    }
+
+    public  class ApplicationUserEntity: IdentityUser
+    {
+        public string NewProperty1 { get; set; }
+        public string NewProperty2 { get; set; }
+
+        public ApplicationUserEntity(UserModel model)
+        {
+            NewProperty1 = model.NewProperty1;
+            NewProperty2 = model.NewProperty2;
+            Email = model.Email;
+            EmailConfirmed = model.EmailConfirmed;
+            PasswordHash = model.PasswordHash;
+            SecurityStamp = model.SecurityStamp;
+            PhoneNumber = model.PhoneNumber;
+            PhoneNumberConfirmed = model.PhoneNumberConfirmed;
+        }
+    }
+}
diff --git a/MappingGenerator/MappingGenerator/MappingGenerator/SymbolHelper.cs b/MappingGenerator/MappingGenerator/MappingGenerator/SymbolHelper.cs
@@ -81,6 +81,13 @@ public static bool CanBeSetPrivately(this IPropertySymbol property)
 
         public static bool CanBeSetPublicly(this IPropertySymbol property, bool isInternalAccessible)
         {
+            if (IsDeclaredOutsideTheSourcecode(property))
+            {
+                return property.IsReadOnly == false && 
+                       property.SetMethod != null &&
+                       property.SetMethod.DeclaredAccessibility == Accessibility.Public;
+            }
+
             var propertyDeclaration = property.DeclaringSyntaxReferences.Select(x => x.GetSyntax()).OfType<PropertyDeclarationSyntax>().FirstOrDefault();
             if (propertyDeclaration?.AccessorList == null)
             {
@@ -92,6 +99,15 @@ public static bool CanBeSetPublicly(this IPropertySymbol property, bool isIntern
 
         public static bool CanBeSetOnlyFromConstructor(this IPropertySymbol property)
         {
+            if (IsDeclaredOutsideTheSourcecode(property))
+            {
+                return property.IsReadOnly ||
+                       (property.SetMethod != null &&
+                       new[] {Accessibility.Public, Accessibility.Protected}.Contains(property.SetMethod.DeclaredAccessibility)
+                       );
+            }
+
+
             var propertyDeclaration = property.DeclaringSyntaxReferences.Select(x => x.GetSyntax()).OfType<PropertyDeclarationSyntax>().FirstOrDefault();
             if (propertyDeclaration?.AccessorList == null)
             {
@@ -106,6 +122,11 @@ public static bool CanBeSetOnlyFromConstructor(this IPropertySymbol property)
             return propertyDeclaration.AccessorList.Accessors.Count == 1 && propertyDeclaration.AccessorList.Accessors.SingleOrDefault(IsAutoGetter) != null;
         }
 
+        private static bool IsDeclaredOutsideTheSourcecode(IPropertySymbol property)
+        {
+            return property.DeclaringSyntaxReferences.Length == 0;
+        }
+
         private static bool HasPrivateSetter(PropertyDeclarationSyntax propertyDeclaration)
         {
             return propertyDeclaration.AccessorList.Accessors.Any(x =>x.Keyword.Kind() == SyntaxKind.SetKeyword && x.Modifiers.Any(m => m.Kind() == SyntaxKind.PrivateKeyword));