Merge pull request #111 from thomasclaudiushuber/issue-105-fix2

Issue 105 fix2

Author: thomasclaudiushuber

src/MvvmGen.SourceGenerators.Tests/MvvmGen.SourceGenerators.Tests.csproj

@@ -5,6 +5,7 @@
     <IsPackable>false</IsPackable>
     <RootNamespace>MvvmGen</RootNamespace>
     <Configurations>Debug;Release;MvvmGen_PureCodeGeneration</Configurations>
+	<LangVersion>13.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/MvvmGen.SourceGenerators.Tests/ViewModelGeneratorTests/Base/ViewModelGeneratorTestBase.cs

@@ -64,7 +64,17 @@ protected static void ShouldGenerateExpectedCode(string inputCode, params string
                     }
                 }
 
-                Assert.True(found, "Expected code must be in generated sources");
+                var output = $"""
+                    Expected code must be in generated sources
+                    
+                    Generated code:
+                    {generatorResult.GeneratedSources.FirstOrDefault().SourceText.ToString()}
+
+                    Expected code:
+                    {expectedCode}
+                    """;
+
+                Assert.True(found, output);
             }
         }
 

src/MvvmGen.SourceGenerators.Tests/ViewModelGeneratorTests/PropertyAttributeTests.cs

@@ -60,6 +60,8 @@ public string FirstName
         [InlineData("public")]
         [InlineData("private")]
         [InlineData("protected")]
+        [InlineData("protected internal")]
+        [InlineData("internal")]
         [Theory]
         public void GeneratePartialProperty(string accessModifier)
         {

src/MvvmGen.SourceGenerators.Tests/ViewModelGeneratorTests/ViewModelGenerateInterfaceAttributeTests.cs

@@ -24,6 +24,10 @@ public partial class EmployeeViewModel
   {{
     [Property] string _firstName;
 
+    [Property] public partial string MiddleName {{ get; set; }}
+
+    [Property] internal partial string InternalNotForInterface {{ get; set; }}
+
     public string LastName {{ get; set; }}
 
     public string FullName => FirstName + "" "" + LastName;
@@ -58,11 +62,42 @@ public string FirstName
                 }}
             }}
         }}
+
+        private string _middleName;
+
+        public partial string MiddleName
+        {{
+            get => _middleName;
+            set
+            {{
+                if (_middleName != value)
+                {{
+                    _middleName = value;
+                    OnPropertyChanged(""MiddleName"");
+                }}
+            }}
+        }}
+
+        private string _internalNotForInterface;
+
+        internal partial string InternalNotForInterface
+        {{
+            get => _internalNotForInterface;
+            set
+            {{
+                if (_internalNotForInterface != value)
+                {{
+                    _internalNotForInterface = value;
+                    OnPropertyChanged(""InternalNotForInterface"");
+                }}
+            }}
+        }}
     }}
 
     public interface IEmployeeViewModel : System.ComponentModel.INotifyPropertyChanged
     {{
         string FirstName {{ get; set; }}
+        string MiddleName {{ get; set; }}
         string LastName {{ get; set; }}
         string FullName {{ get; }}
         void CustomMethod();

src/MvvmGen.SourceGenerators/Inspectors/ViewModelGenerateInterfaceAttributeInspector.cs

@@ -47,9 +47,12 @@ internal static class ViewModelGenerateInterfaceAttributeInspector
             {
                 foreach (var propertyToGenerate in propertiesToGenerate)
                 {
-                    properties ??= new();
-                    properties.Add(new InterfaceProperty(propertyToGenerate.PropertyName,
-                        propertyToGenerate.PropertyType, propertyToGenerate.IsReadOnly));
+                    if (propertyToGenerate.AccessModifier == "public") // partial properties can have other access modifiers than public, for example internal
+                    {
+                        properties ??= new();
+                        properties.Add(new InterfaceProperty(propertyToGenerate.PropertyName,
+                            propertyToGenerate.PropertyType, propertyToGenerate.IsReadOnly));
+                    }
                 }
             }
 
@@ -59,6 +62,11 @@ internal static class ViewModelGenerateInterfaceAttributeInspector
                 {
                     if (memberSymbol is IPropertySymbol propertySymbol)
                     {
+                        if (propertySymbol.IsPartialDefinition)
+                        {
+                            continue; // Partial properties are already part of propertiesToGenerate list and so added already to the properties list
+                        }
+
                         properties ??= new();
                         properties.Add(new InterfaceProperty(propertySymbol.Name,
                             propertySymbol.Type.ToDisplayString(), propertySymbol.IsReadOnly));

src/MvvmGen.SourceGenerators/Inspectors/ViewModelMemberInspector.cs

@@ -216,9 +216,18 @@ private static void FindPropertiesToGenerate(ISymbol symbol, List<PropertyToGene
                 }
 
                 var generateBackingField = symbol.Kind == SymbolKind.Property;
+                var accessModifier = "public";
+                if(symbol.Kind== SymbolKind.Property)
+                {
+                    accessModifier = propertySymbol!.DeclaredAccessibility switch
+                    {
+                        Accessibility.ProtectedOrInternal => "protected internal",
+                        _ => propertySymbol!.DeclaredAccessibility.ToString().ToLower()
+                    };
+                }
 
                 propertiesToGenerate.Add(new PropertyToGenerate(propertyName, propertyType, fieldName,
-                    generateBackingField, isReadOnly: false, accessModifier: (symbol.Kind == SymbolKind.Field ? "public" : propertySymbol!.DeclaredAccessibility.ToString().ToLower()))
+                    generateBackingField, isReadOnly: false, accessModifier)
                 {
                     EventsToPublish = eventsToPublish,
                     MethodsToCall = methodsToCall