Add non-embedded attributes to all tests that use older framework versions.

Author: siegfriedpammer

ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection.PortableExecutable;
@@ -330,6 +329,45 @@ static string GetTargetFrameworkAttributeSnippetFile()
 			return tempFile;
 		}
 
+		const string nonEmbeddedAttributesSnippet = @"
+using System;
+
+#if !NET60
+namespace System.Runtime.CompilerServices
+{
+	[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+	internal sealed class CompilerFeatureRequiredAttribute : Attribute
+	{
+		public CompilerFeatureRequiredAttribute(string featureName)
+		{
+		}
+	}
+
+	internal class IsExternalInit
+	{
+	}
+#endif
+#if !NET70
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+	internal sealed class RequiredMemberAttribute : Attribute
+	{
+	}
+#endif
+#if !NET60
+}
+#endif
+";
+
+		static readonly Lazy<string> nonEmbeddedAttributesSnippetFile = new Lazy<string>(GetNonEmbeddedAttributesSnippetFile);
+
+		static string GetNonEmbeddedAttributesSnippetFile()
+		{
+			// Note: this leaks a temporary file, we're not attempting to delete it, because it is only one.
+			var tempFile = Path.GetTempFileName();
+			File.WriteAllText(tempFile, nonEmbeddedAttributesSnippet);
+			return tempFile;
+		}
+
 		public static List<string> GetPreprocessorSymbols(CompilerOptions flags)
 		{
 			var preprocessorSymbols = new List<string>();
@@ -419,6 +457,11 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 				sourceFileNames.Add(targetFrameworkAttributeSnippetFile.Value);
 			}
 
+			if (targetNet40)
+			{
+				sourceFileNames.Add(nonEmbeddedAttributesSnippetFile.Value);
+			}
+
 			var preprocessorSymbols = GetPreprocessorSymbols(flags);
 
 			if ((flags & CompilerOptions.UseMcsMask) == 0)

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -151,7 +151,7 @@
     <None Include="TestCases\Pretty\CovariantReturns.cs" />
     <Compile Include="TestCases\VBPretty\VBPropertiesTest.cs" />
     <None Include="TestCases\ILPretty\Issue2260SwitchString.cs" />
-    <None Include="TestCases\Pretty\Records.cs" />
+    <Compile Include="TestCases\Pretty\Records.cs" />
     <Compile Include="TestCases\VBPretty\Issue2192.cs" />
     <Compile Include="Util\FileUtilityTests.cs" />
     <Compile Include="TestCases\Pretty\FunctionPointers.cs" />

ICSharpCode.Decompiler.Tests/TestCases/Pretty/Records.cs

@@ -44,7 +44,7 @@ public record Pair<A, B>
 		public record PairWithPrimaryCtor<A, B>(A First, B Second);
 
 		public record PrimaryCtor(int A, string B);
-		public record PrimaryCtorWithAttribute([RecordTest("param")] [property: RecordTest("property")][field: RecordTest("field")] int a);
+		public record PrimaryCtorWithAttribute([RecordTest("param")][property: RecordTest("property")][field: RecordTest("field")] int a);
 		public record PrimaryCtorWithField(int A, string B)
 		{
 			public double C = 1.0;
@@ -169,7 +169,7 @@ public record struct Pair<A, B>
 		public record struct PairWithPrimaryCtor<A, B>(A First, B Second);
 
 		public record struct PrimaryCtor(int A, string B);
-		public record struct PrimaryCtorWithAttribute([RecordTest("param")] [property: RecordTest("property")][field: RecordTest("field")] int a);
+		public record struct PrimaryCtorWithAttribute([RecordTest("param")][property: RecordTest("property")][field: RecordTest("field")] int a);
 		public record struct PrimaryCtorWithField(int A, string B)
 		{
 			public double C = 1.0;
@@ -242,27 +242,3 @@ public record struct WithRequiredMembers
 	}
 #endif
 }
-#if !NET60
-namespace System.Runtime.CompilerServices
-{
-	[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
-	internal sealed class CompilerFeatureRequiredAttribute : Attribute
-	{
-		public CompilerFeatureRequiredAttribute(string featureName)
-		{
-		}
-	}
-
-	internal class IsExternalInit
-	{
-	}
-#endif
-#if !NET70
-	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-	internal sealed class RequiredMemberAttribute : Attribute
-	{
-	}
-#endif
-#if !NET60
-}
-#endif

ICSharpCode.Decompiler.Tests/TestCases/Pretty/Structs.cs

@@ -59,20 +59,4 @@ public struct StructWithRequiredMembers
 		public required string LastName { get; set; }
 	}
 #endif
-}
-
-namespace System.Runtime.CompilerServices
-{
-	[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
-	internal sealed class CompilerFeatureRequiredAttribute : Attribute
-	{
-		public CompilerFeatureRequiredAttribute(string featureName)
-		{
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-	internal sealed class RequiredMemberAttribute : Attribute
-	{
-	}
-}
+}

ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs

@@ -1530,8 +1530,8 @@ public virtual void VisitAttributeSection(AttributeSection attributeSection)
 			WriteToken(Roles.RBracket);
 			switch (attributeSection.Parent)
 			{
-				case ParameterDeclaration _:
-					if (attributeSection.NextSibling is AttributeSection)
+				case ParameterDeclaration pd:
+					if (pd.Attributes.Last() != attributeSection)
 						Space(policy.SpaceBetweenParameterAttributeSections);
 					else
 						Space();

ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs

@@ -172,13 +172,27 @@ public class RemoveEmbeddedAttributes : DepthFirstAstVisitor, IAstTransform
 			"Microsoft.CodeAnalysis.EmbeddedAttribute",
 		};
 
+		internal static readonly HashSet<string> nonEmbeddedAttributeNames = new HashSet<string>() {
+			// non-embedded attributes, but we still want to remove them
+			"System.Runtime.CompilerServices.CompilerFeatureRequiredAttribute",
+			"System.Runtime.CompilerServices.RequiredMemberAttribute",
+			"System.Runtime.CompilerServices.IsExternalInit",
+		};
+
 		public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
 		{
 			var typeDefinition = typeDeclaration.GetSymbol() as ITypeDefinition;
-			if (typeDefinition == null || !attributeNames.Contains(typeDefinition.FullName))
+			if (typeDefinition == null)
 				return;
-			if (!typeDefinition.HasAttribute(KnownAttribute.Embedded))
+
+			if (attributeNames.Contains(typeDefinition.FullName))
+			{
+				if (!typeDefinition.HasAttribute(KnownAttribute.Embedded))
+					return;
+			}
+			else if (!nonEmbeddedAttributeNames.Contains(typeDefinition.FullName))
 				return;
+
 			if (typeDeclaration.Parent is NamespaceDeclaration ns && ns.Members.Count == 1)
 				ns.Remove();
 			else