WIP

Author: siegfriedpammer

BuildTools/pre-commit

@@ -5,11 +5,11 @@
 
 set -eu
 
-DOTNET_FORMAT_VERSION=9.0.520307
+DOTNET_FORMAT_VERSION=10.0.100-preview.6.25358.103
 DOTNET_PATH="$LOCALAPPDATA/ICSharpCode/ILSpy/dotnet-format-$DOTNET_FORMAT_VERSION"
 if [ ! -d "$DOTNET_PATH" ]; then
  echo "Downloading dotnet-format $DOTNET_FORMAT_VERSION..."
- dotnet tool install --tool-path "$DOTNET_PATH" dotnet-format --version "$DOTNET_FORMAT_VERSION" --add-source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json"
+ dotnet tool install --tool-path "$DOTNET_PATH" dotnet-format --version "$DOTNET_FORMAT_VERSION" --add-source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json"
 fi
 
 "$DOTNET_PATH/dotnet-format.exe" --version

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

@@ -1,16 +1,38 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
 {
-	static class ExtensionProperties
+	internal static class ExtensionProperties
 	{
-		extension<T>(ICollection<T> collection)
+		extension<T>(ICollection<T> collection) where T : notnull
 		{
 			public bool IsEmpty => collection.Count == 0;
 
-		public void AddIfNotNull(T item) { }
+			public int Test {
+				get {
+					return 42;
+				}
+				set {
+				}
+			}
 
-		public static void StaticExtension() { }
+			public void AddIfNotNull(T item)
+			{
+				if (item != null)
+				{
+					collection.Add(item);
+				}
+			}
+
+			public T2 Cast<T2>(int index) where T2 : T
+			{
+				return (T2)(object)collection.ElementAt(index);
+			}
+
+			public static void StaticExtension()
+			{
+			}
+		}
 	}
 }
-}

ICSharpCode.Decompiler.Tests/TypeSystem/TypeSystemLoaderTests.cs

@@ -1993,5 +1993,23 @@ public void HasSpecialName()
 			Assert.That(@class.HasAttribute(KnownAttribute.SpecialName));
 			Assert.That(@struct.HasAttribute(KnownAttribute.SpecialName));
 		}
+
+		[Test]
+		public void ExtensionEverything()
+		{
+			var extensionEverything = GetTypeDefinition(typeof(ExtensionEverything));
+			Assert.That(extensionEverything.IsStatic, Is.True, "ExtensionEverything should be static");
+			Assert.That(extensionEverything.HasExtensions, Is.True, "ExtensionEverything should have extensions");
+			var info = extensionEverything.ExtensionInfo;
+			Assert.That(info, Is.Not.Null, "ExtensionEverything should have ExtensionInfo");
+			foreach (var method in extensionEverything.Methods)
+			{
+				Assert.That(method.IsStatic, Is.True, "Method should be static: " + method.Name);
+				ExtensionMemberInfo? infoOfImpl = info.InfoOfImplementationMember(method);
+				Assert.That(infoOfImpl, Is.Not.Null, "Method should have implementation info: " + method.Name);
+				ExtensionMemberInfo? infoOfExtension = info.InfoOfExtensionMember(infoOfImpl.Value.ExtensionMember);
+				Assert.That(infoOfExtension, Is.EqualTo(infoOfImpl), "Info of extension member should be equal to info of implementation member: " + method.Name);
+			}
+		}
 	}
 }

ICSharpCode.Decompiler.Tests/TypeSystem/TypeSystemTestCase.cs

@@ -753,4 +753,24 @@ public interface IMarshalAsTests
 		[DispId(11)]
 		void StopRouter();
 	}
+
+	public static class ExtensionEverything
+	{
+		extension(int input)
+		{
+			public void Method() { }
+			public void Method(char c) { }
+			public string AsString => input.ToString();
+			public string Test {
+				get => "Test";
+				set { }
+			}
+			public static void StaticMethod() { }
+			public static void StaticMethod(double x) { }
+			public static string StaticProperty => "StaticProperty";
+			public static void GenericMethod<T>(T value)
+			{
+			}
+		}
+	}
 }

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -318,7 +318,9 @@ public static bool MemberIsHidden(MetadataFile module, EntityHandle member, Deco
 							return true;
 						if (settings.FixedBuffers && name.StartsWith("<", StringComparison.Ordinal) && name.Contains("__FixedBuffer"))
 							return true;
-						if (settings.InlineArrays && name.StartsWith("<>y__InlineArray", StringComparison.Ordinal) && name.EndsWith("`1"))
+						if (settings.InlineArrays && name.StartsWith("<>y__InlineArray", StringComparison.Ordinal) && name.EndsWith("`1", StringComparison.Ordinal))
+							return true;
+						if (settings.ExtensionMembers && name.StartsWith("<>E__", StringComparison.Ordinal))
 							return true;
 					}
 					else if (type.IsCompilerGenerated(metadata))
@@ -1037,7 +1039,7 @@ public SyntaxTree Decompile(IEnumerable<EntityHandle> definitions)
 						break;
 					case HandleKind.MethodDefinition:
 						IMethod method = module.GetDefinition((MethodDefinitionHandle)entity);
-						syntaxTree.Members.Add(DoDecompile(method, decompileRun, new SimpleTypeResolveContext(method)));
+						syntaxTree.Members.Add(DoDecompile(method, decompileRun, new SimpleTypeResolveContext(method), null));
 						if (first)
 						{
 							parentTypeDef = method.DeclaringTypeDefinition;
@@ -1054,7 +1056,7 @@ public SyntaxTree Decompile(IEnumerable<EntityHandle> definitions)
 						break;
 					case HandleKind.PropertyDefinition:
 						IProperty property = module.GetDefinition((PropertyDefinitionHandle)entity);
-						syntaxTree.Members.Add(DoDecompile(property, decompileRun, new SimpleTypeResolveContext(property)));
+						syntaxTree.Members.Add(DoDecompile(property, decompileRun, new SimpleTypeResolveContext(property), null));
 						if (first)
 						{
 							parentTypeDef = property.DeclaringTypeDefinition;
@@ -1361,14 +1363,45 @@ EntityDeclaration DoDecompile(ITypeDefinition typeDef, DecompileRun decompileRun
 					partialTypeInfo = null;
 				}
 
+				if (settings.ExtensionMembers)
+				{
+					foreach (var group in typeDef.ExtensionInfo?.GetGroups() ?? [])
+					{
+						var ext = new ExtensionDeclaration();
+						ext.TypeParameters.AddRange(group.Key.DeclaringTypeDefinition.TypeParameters.Select(tp => typeSystemAstBuilder.ConvertTypeParameter(tp)));
+						ext.ReceiverParameters.Add(typeSystemAstBuilder.ConvertParameter(group.Key.Parameters.Single()));
+						AddAnnotationsToDeclaration(method, ext, function, parameterOffset);
+						ext.Constraints.AddRange(group.Key.DeclaringTypeDefinition.TypeParameters.Select(c => typeSystemAstBuilder.ConvertTypeParameterConstraint(c)));
+
+						foreach (var member in group)
+						{
+							IMember extMember = member.ExtensionMember;
+							if (member.ExtensionMember.IsAccessor)
+							{
+								extMember = member.ExtensionMember.AccessorOwner;
+							}
+							if (entityMap.Contains(extMember) || extMember.MetadataToken.IsNil)
+							{
+								// Member is already decompiled.
+								continue;
+							}
+							EntityDeclaration extMemberDecl = DoDecompileExtensionMember(extMember, typeDef.ExtensionInfo, decompileRun, decompilationContext);
+							ext.Members.Add(extMemberDecl);
+							entityMap.Add(extMember, extMemberDecl);
+						}
+
+						typeDecl.Members.Add(ext);
+					}
+				}
+
 				// Decompile members that are not compiler-generated.
 				foreach (var entity in allOrderedEntities)
 				{
 					if (entity.MetadataToken.IsNil || MemberIsHidden(module.MetadataFile, entity.MetadataToken, settings))
 					{
 						continue;
 					}
-					DoDecompileMember(entity, recordDecompiler, partialTypeInfo);
+					DoDecompileMember(entity, recordDecompiler, partialTypeInfo, typeDef.ExtensionInfo);
 				}
 
 				// Decompile compiler-generated members that are still needed.
@@ -1380,7 +1413,7 @@ EntityDeclaration DoDecompile(ITypeDefinition typeDef, DecompileRun decompileRun
 						// Member is already decompiled.
 						continue;
 					}
-					DoDecompileMember(entity, recordDecompiler, partialTypeInfo);
+					DoDecompileMember(entity, recordDecompiler, partialTypeInfo, typeDef.ExtensionInfo);
 				}
 
 				// Add all decompiled members to syntax tree in the correct order.
@@ -1470,13 +1503,18 @@ EntityDeclaration DoDecompile(ITypeDefinition typeDef, DecompileRun decompileRun
 				Instrumentation.DecompilerEventSource.Log.DoDecompileTypeDefinition(typeDef.FullName, watch.ElapsedMilliseconds);
 			}
 
-			void DoDecompileMember(IEntity entity, RecordDecompiler recordDecompiler, PartialTypeInfo partialType)
+			void DoDecompileMember(IEntity entity, RecordDecompiler recordDecompiler, PartialTypeInfo partialType, ExtensionInfo extensionInfo)
 			{
 				if (partialType != null && partialType.IsDeclaredMember(entity.MetadataToken))
 				{
 					return;
 				}
 
+				if (settings.ExtensionMembers && extensionInfo != null && entity is IMethod m && extensionInfo.InfoOfImplementationMember(m).HasValue)
+				{
+					return;
+				}
+
 				EntityDeclaration entityDecl;
 				switch (entity)
 				{
@@ -1497,15 +1535,15 @@ void DoDecompileMember(IEntity entity, RecordDecompiler recordDecompiler, Partia
 						{
 							return;
 						}
-						entityDecl = DoDecompile(property, decompileRun, decompilationContext.WithCurrentMember(property));
+						entityDecl = DoDecompile(property, decompileRun, decompilationContext.WithCurrentMember(property), null);
 						entityMap.Add(property, entityDecl);
 						break;
 					case IMethod method:
 						if (recordDecompiler?.MethodIsGenerated(method) == true)
 						{
 							return;
 						}
-						entityDecl = DoDecompile(method, decompileRun, decompilationContext.WithCurrentMember(method));
+						entityDecl = DoDecompile(method, decompileRun, decompilationContext.WithCurrentMember(method), null);
 						entityMap.Add(method, entityDecl);
 						foreach (var helper in AddInterfaceImplHelpers(entityDecl, method, typeSystemAstBuilder))
 						{
@@ -1543,6 +1581,19 @@ void DoDecompileMember(IEntity entity, RecordDecompiler recordDecompiler, Partia
 			}
 		}
 
+		private EntityDeclaration DoDecompileExtensionMember(IMember extMember, ExtensionInfo info, DecompileRun decompileRun, ITypeResolveContext decompilationContext)
+		{
+			switch (extMember)
+			{
+				case IProperty p:
+					return DoDecompile(p, decompileRun, decompilationContext.WithCurrentMember(p), info);
+				case IMethod m:
+					return DoDecompile(m, decompileRun, decompilationContext.WithCurrentMember(m), info);
+			}
+
+			throw new NotSupportedException($"Extension member {extMember} is not supported for decompilation.");
+		}
+
 		EnumValueDisplayMode DetectBestEnumValueDisplayMode(ITypeDefinition typeDef, MetadataFile module)
 		{
 			if (typeDef.HasAttribute(KnownAttribute.Flags))
@@ -1604,7 +1655,7 @@ EnumValueDisplayMode DetectBestEnumValueDisplayMode(ITypeDefinition typeDef, Met
 			return firstValue == 0 ? EnumValueDisplayMode.None : EnumValueDisplayMode.FirstOnly;
 		}
 
-		EntityDeclaration DoDecompile(IMethod method, DecompileRun decompileRun, ITypeResolveContext decompilationContext)
+		EntityDeclaration DoDecompile(IMethod method, DecompileRun decompileRun, ITypeResolveContext decompilationContext, ExtensionInfo extensionInfo)
 		{
 			Debug.Assert(decompilationContext.CurrentMember == method);
 			var watch = System.Diagnostics.Stopwatch.StartNew();
@@ -1630,7 +1681,7 @@ EntityDeclaration DoDecompile(IMethod method, DecompileRun decompileRun, ITypeRe
 				}
 				if (methodDefinition.HasBody())
 				{
-					DecompileBody(method, methodDecl, decompileRun, decompilationContext);
+					DecompileBody(method, methodDecl, decompileRun, decompilationContext, extensionInfo);
 				}
 				else if (!method.IsAbstract && method.DeclaringType.Kind != TypeKind.Interface)
 				{
@@ -1699,7 +1750,7 @@ internal static bool IsWindowsFormsInitializeComponentMethod(IMethod method)
 			return method.ReturnType.Kind == TypeKind.Void && method.Name == "InitializeComponent" && method.DeclaringTypeDefinition.GetNonInterfaceBaseTypes().Any(t => t.FullName == "System.Windows.Forms.Control");
 		}
 
-		void DecompileBody(IMethod method, EntityDeclaration entityDecl, DecompileRun decompileRun, ITypeResolveContext decompilationContext)
+		void DecompileBody(IMethod method, EntityDeclaration entityDecl, DecompileRun decompileRun, ITypeResolveContext decompilationContext, ExtensionInfo extensionInfo)
 		{
 			try
 			{
@@ -1708,6 +1759,14 @@ void DecompileBody(IMethod method, EntityDeclaration entityDecl, DecompileRun de
 					UseRefLocalsForAccurateOrderOfEvaluation = settings.UseRefLocalsForAccurateOrderOfEvaluation,
 					DebugInfo = DebugInfoProvider
 				};
+				int parameterOffset = 0;
+				if (extensionInfo != null)
+				{
+					if (!method.IsStatic)
+						parameterOffset = 1; // implementation method has an additional receiver parameter
+					method = extensionInfo.InfoOfExtensionMember(method).Value.ImplementationMethod;
+				}
+
 				var methodDef = metadata.GetMethodDefinition((MethodDefinitionHandle)method.MetadataToken);
 				var body = BlockStatement.Null;
 				MethodBodyBlock methodBody;
@@ -1727,7 +1786,7 @@ void DecompileBody(IMethod method, EntityDeclaration entityDecl, DecompileRun de
 				var function = ilReader.ReadIL((MethodDefinitionHandle)method.MetadataToken, methodBody, cancellationToken: CancellationToken);
 				function.CheckInvariant(ILPhase.Normal);
 
-				AddAnnotationsToDeclaration(method, entityDecl, function);
+				AddAnnotationsToDeclaration(method, entityDecl, function, parameterOffset);
 
 				var localSettings = settings.Clone();
 				if (IsWindowsFormsInitializeComponentMethod(method))
@@ -1786,9 +1845,9 @@ void DecompileBody(IMethod method, EntityDeclaration entityDecl, DecompileRun de
 			}
 		}
 
-		internal static void AddAnnotationsToDeclaration(IMethod method, EntityDeclaration entityDecl, ILFunction function)
+		internal static void AddAnnotationsToDeclaration(IMethod method, EntityDeclaration entityDecl, ILFunction function, int parameterOffset = 0)
 		{
-			int i = 0;
+			int i = parameterOffset;
 			var parameters = function.Variables.Where(v => v.Kind == VariableKind.Parameter).ToDictionary(v => v.Index);
 			foreach (var parameter in entityDecl.GetChildrenByRole(Roles.Parameter))
 			{
@@ -2023,7 +2082,7 @@ internal static bool IsFixedField(IField field, out IType type, out int elementC
 			return false;
 		}
 
-		EntityDeclaration DoDecompile(IProperty property, DecompileRun decompileRun, ITypeResolveContext decompilationContext)
+		EntityDeclaration DoDecompile(IProperty property, DecompileRun decompileRun, ITypeResolveContext decompilationContext, ExtensionInfo extensionInfo)
 		{
 			Debug.Assert(decompilationContext.CurrentMember == property);
 			var watch = System.Diagnostics.Stopwatch.StartNew();
@@ -2053,11 +2112,11 @@ EntityDeclaration DoDecompile(IProperty property, DecompileRun decompileRun, ITy
 				bool setterHasBody = property.CanSet && property.Setter.HasBody;
 				if (getterHasBody)
 				{
-					DecompileBody(property.Getter, getter, decompileRun, decompilationContext);
+					DecompileBody(property.Getter, getter, decompileRun, decompilationContext, extensionInfo);
 				}
 				if (setterHasBody)
 				{
-					DecompileBody(property.Setter, setter, decompileRun, decompilationContext);
+					DecompileBody(property.Setter, setter, decompileRun, decompilationContext, extensionInfo);
 				}
 				if (!getterHasBody && !setterHasBody && !property.IsAbstract && property.DeclaringType.Kind != TypeKind.Interface)
 				{
@@ -2113,11 +2172,11 @@ EntityDeclaration DoDecompile(IEvent ev, DecompileRun decompileRun, ITypeResolve
 				}
 				if (adderHasBody)
 				{
-					DecompileBody(ev.AddAccessor, ((CustomEventDeclaration)eventDecl).AddAccessor, decompileRun, decompilationContext);
+					DecompileBody(ev.AddAccessor, ((CustomEventDeclaration)eventDecl).AddAccessor, decompileRun, decompilationContext, null);
 				}
 				if (removerHasBody)
 				{
-					DecompileBody(ev.RemoveAccessor, ((CustomEventDeclaration)eventDecl).RemoveAccessor, decompileRun, decompilationContext);
+					DecompileBody(ev.RemoveAccessor, ((CustomEventDeclaration)eventDecl).RemoveAccessor, decompileRun, decompilationContext, null);
 				}
 				if (!adderHasBody && !removerHasBody && !ev.IsAbstract && ev.DeclaringType.Kind != TypeKind.Interface)
 				{

ICSharpCode.Decompiler/CSharp/CSharpLanguageVersion.cs

@@ -36,7 +36,8 @@ public enum LanguageVersion
 		CSharp11_0 = 1100,
 		CSharp12_0 = 1200,
 		CSharp13_0 = 1300,
-		Preview = 1300,
+		CSharp14_0 = 1400,
+		Preview = 1400,
 		Latest = 0x7FFFFFFF
 	}
 }

ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs

@@ -2417,6 +2417,36 @@ public virtual void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberD
 			EndNode(enumMemberDeclaration);
 		}
 
+		public virtual void VisitExtensionDeclaration(ExtensionDeclaration extensionDeclaration)
+		{
+			StartNode(extensionDeclaration);
+			WriteAttributes(extensionDeclaration.Attributes);
+			WriteModifiers(extensionDeclaration.ModifierTokens);
+			WriteKeyword(ExtensionDeclaration.ExtensionKeywordRole);
+			WriteTypeParameters(extensionDeclaration.TypeParameters);
+			Space(policy.SpaceBeforeMethodDeclarationParentheses);
+			WriteCommaSeparatedListInParenthesis(extensionDeclaration.ReceiverParameters, policy.SpaceWithinMethodDeclarationParentheses);
+			foreach (Constraint constraint in extensionDeclaration.Constraints)
+			{
+				constraint.AcceptVisitor(this);
+			}
+			OpenBrace(policy.ClassBraceStyle);
+			bool first = true;
+			foreach (var member in extensionDeclaration.Members)
+			{
+				if (!first)
+				{
+					for (int i = 0; i < policy.MinimumBlankLinesBetweenMembers; i++)
+						NewLine();
+				}
+				first = false;
+				member.AcceptVisitor(this);
+			}
+			CloseBrace(policy.ClassBraceStyle);
+			NewLine();
+			EndNode(extensionDeclaration);
+		}
+
 		public virtual void VisitEventDeclaration(EventDeclaration eventDeclaration)
 		{
 			StartNode(eventDeclaration);