Omit init properties (#169)

* Omit init properties

* Add test for NewType and make init work for older .NET versions

Co-authored-by: maca88 <bostjan.markezic@siol.net>

Author: gliljas

Source/AsyncGenerator.Tests/AsyncGenerator.Tests.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(TestTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <NoWarn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">CS8032</NoWarn>
   </PropertyGroup>
 
@@ -55,6 +55,10 @@
     <EmbeddedResource Include="**\*.txt;**\*.yml;**\*.xml" Exclude="bin\**\*.*;obj\**\*.*" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="AsyncProperites\Output\InitSetter.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\AsyncGenerator\Internal\EnvironmentHelper.cs">
       <Link>EnvironmentHelper.cs</Link>

Source/AsyncGenerator.Tests/AsyncProperites/Input/InitSetter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AsyncGenerator.TestCases;
+
+namespace AsyncGenerator.Tests.AsyncProperites.Input
+{
+	public class InitSetter
+	{
+		public string InitWriteSuccess
+		{
+			init { Write(value); }
+		}
+
+		public string WriteSuccess
+		{
+			set { Write(value); }
+		}
+
+		private bool Write(string value)
+		{
+			return SimpleFile.Write(value);
+		}
+
+		protected void SetSuccess()
+		{
+			WriteSuccess = "";
+		}
+	}
+}

Source/AsyncGenerator.Tests/AsyncProperites/Output/InitSetter.txt

@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AsyncGenerator.TestCases;
+
+namespace AsyncGenerator.Tests.AsyncProperites.Input
+{
+	public partial class InitSetter
+	{
+
+		public Task SetWriteSuccessAsync(string value)
+		{
+			return WriteAsync(value);
+		}
+
+		private Task<bool> WriteAsync(string value)
+		{
+			return SimpleFile.WriteAsync(value);
+		}
+
+		protected async Task SetSuccessAsync()
+		{
+			await (SetWriteSuccessAsync(""));
+		}
+	}
+}

Source/AsyncGenerator.Tests/AsyncProperites/Output/InitSetterNewType.txt

@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AsyncGenerator.TestCases;
+
+namespace AsyncGenerator.Tests.AsyncProperites.Input
+{
+	public class InitSetterAsync
+	{
+		public string InitWriteSuccess
+		{
+			init { Write(value); }
+		}
+
+		public string WriteSuccess
+		{
+			set { Write(value); }
+		}
+
+		public Task SetWriteSuccessAsync(string value)
+		{
+			return WriteAsync(value);
+		}
+
+		private Task<bool> WriteAsync(string value)
+		{
+			return SimpleFile.WriteAsync(value);
+		}
+
+		private bool Write(string value)
+		{
+			return SimpleFile.Write(value);
+		}
+
+		protected async Task SetSuccessAsync()
+		{
+			await (SetWriteSuccessAsync(""));
+		}
+	}
+}

Source/AsyncGenerator.Tests/AsyncProperites/SetterFixture.cs

@@ -162,5 +162,48 @@ public Task TestSetAccessorAfterTransformation()
 				)
 			);
 		}
+
+		[Test]
+		public Task TestInitSetterAfterTransformation()
+		{
+			return ReadonlyTest(nameof(InitSetter), p => p
+				.ConfigureAnalyzation(a => a
+					.MethodConversion(symbol => MethodConversion.Smart)
+					.PropertyConversion(true)
+				)
+				.ConfigureTransformation(t => t
+					.AfterTransformation(result =>
+					{
+						AssertValidAnnotations(result);
+						Assert.AreEqual(1, result.Documents.Count);
+						var document = result.Documents[0];
+						Assert.NotNull(document.OriginalModified);
+						Assert.AreEqual(GetOutputFile(nameof(InitSetter)), document.Transformed.ToFullString());
+					})
+				)
+			);
+		}
+
+		[Test]
+		public Task TestInitSetterNewTypeAfterTransformation()
+		{
+			return ReadonlyTest(nameof(InitSetter), p => p
+				.ConfigureAnalyzation(a => a
+					.MethodConversion(symbol => MethodConversion.Smart)
+					.PropertyConversion(true)
+					.TypeConversion(o => TypeConversion.NewType)
+				)
+				.ConfigureTransformation(t => t
+					.AfterTransformation(result =>
+					{
+						AssertValidAnnotations(result);
+						Assert.AreEqual(1, result.Documents.Count);
+						var document = result.Documents[0];
+						Assert.IsNull(document.OriginalModified);
+						Assert.AreEqual(GetOutputFile($"{nameof(InitSetter)}NewType"), document.Transformed.ToFullString());
+					})
+				)
+			);
+		}
 	}
 }

Source/AsyncGenerator/Internal/EnvironmentHelper.cs

@@ -10,6 +10,17 @@
 using Microsoft.Build.Locator;
 using Microsoft.CodeAnalysis.MSBuild;
 
+#if NET472 || (NETCOREAPP && !NET5_0_OR_GREATER)
+
+// To make init (C# 9.0) work with older .NET versions
+namespace System.Runtime.CompilerServices
+{
+	internal static class IsExternalInit
+	{
+	}
+}
+#endif
+
 #if NETCOREAPP || NET472
 
 namespace AsyncGenerator.Internal

Source/AsyncGenerator/Internal/PropertyData.cs

@@ -24,9 +24,10 @@ public PropertyData(TypeData typeData, IPropertySymbol symbol, PropertyDeclarati
 					? (SyntaxNode)Node.AccessorList.Accessors.First(o => o.Keyword.IsKind(SyntaxKind.GetKeyword))
 					: Node.ExpressionBody);
 			}
-			if (Symbol.SetMethod != null)
+			//Ignore init setters
+			if (Symbol.SetMethod != null && Node.AccessorList.Accessors.FirstOrDefault(o => o.Keyword.IsKind(SyntaxKind.SetKeyword)) is AccessorDeclarationSyntax accessorDeclaration)
 			{
-				SetAccessorData = new AccessorData(this, Symbol.SetMethod, Node.AccessorList.Accessors.First(o => o.Keyword.IsKind(SyntaxKind.SetKeyword)));
+				SetAccessorData = new AccessorData(this, Symbol.SetMethod, accessorDeclaration);
 			}
 		}