Update decompiler submodule

dnSpyEx · Aug 2, 2023 · 8689a96 · 8689a96
1 parent 8af4fd4
commit 8689a96
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler b/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler
diff --git a/Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy.Core/Mixed/ILWithCSharpDecompiler.cs b/Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy.Core/Mixed/ILWithCSharpDecompiler.cs
@@ -100,7 +100,7 @@ SourceStatementProvider GetDebugInfo(DecompilationContext ctx, MethodDef method,
 		(MethodDebugInfo debugInfo, MethodDebugInfo? stateMachineDebugInfo) TryDecompileCode(MethodDef method, DecompilationContext ctx, DecompilerOutputImpl output, bool disableStateMachineDecompilation) {
 			output.Initialize(method);
 			var settings = csharpLangSettings.Settings.Clone();
-			settings.UsingDeclarations = false;
+			//settings.UsingDeclarations = false;
 			if (disableStateMachineDecompilation) {
 				settings.AsyncAwait = false;
 				settings.YieldReturn = false;
@@ -111,6 +111,7 @@ SourceStatementProvider GetDebugInfo(DecompilationContext ctx, MethodDef method,
 				state.AstBuilder.Context.CurrentType = method.DeclaringType;
 				state.AstBuilder.Context.CancellationToken = ctx.CancellationToken;
 				state.AstBuilder.Context.Settings = settings;
+				state.AstBuilder.InitializeTypeSystem();
 				state.AstBuilder.AddMethod(method);
 				state.AstBuilder.RunTransformations();
 				state.AstBuilder.GenerateCode(output);

diff --git a/Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy/Settings/CSharpDecompilerSettingsPage.cs b/Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy/Settings/CSharpDecompilerSettingsPage.cs
@@ -165,14 +165,14 @@ public void OnApply(IAppRefreshSettings appRefreshSettings) {
 			if (g.SortMembers != d.SortMembers) flags |= RefreshFlags.CSharp;
 			if (g.ForceShowAllMembers != d.ForceShowAllMembers) flags |= RefreshFlags.CSharp | RefreshFlags.ShowMember;
 			if (g.SortSystemUsingStatementsFirst != d.SortSystemUsingStatementsFirst) flags |= RefreshFlags.CSharp;
-			// if (g.MaxArrayElements != d.MaxArrayElements) flags |= RefreshFlags.CSharp;
+			if (g.MaxArrayElements != d.MaxArrayElements) flags |= RefreshFlags.CSharp;
 			if (g.MaxStringLength != d.MaxStringLength) flags |= RefreshFlags.CSharp;
 			if (g.SortCustomAttributes != d.SortCustomAttributes) flags |= RefreshFlags.CSharp;
 			if (g.UseSourceCodeOrder != d.UseSourceCodeOrder) flags |= RefreshFlags.CSharp;
 			if (g.AllowFieldInitializers != d.AllowFieldInitializers) flags |= RefreshFlags.CSharp;
 			if (g.OneCustomAttributePerLine != d.OneCustomAttributePerLine) flags |= RefreshFlags.CSharp;
-			// if (g.TypeAddInternalModifier != d.TypeAddInternalModifier) flags |= RefreshFlags.CSharp;
-			// if (g.MemberAddPrivateModifier != d.MemberAddPrivateModifier) flags |= RefreshFlags.CSharp;
+			if (g.TypeAddInternalModifier != d.TypeAddInternalModifier) flags |= RefreshFlags.CSharp;
+			if (g.MemberAddPrivateModifier != d.MemberAddPrivateModifier) flags |= RefreshFlags.CSharp;
 			if (g.HexadecimalNumbers != d.HexadecimalNumbers) flags |= RefreshFlags.CSharp;
 			//if (g.EmitCalliAsInvocationExpression != d.EmitCalliAsInvocationExpression) flags |= RefreshFlags.CSharp;
 			if (g.InsertParenthesesForReadability != d.InsertParenthesesForReadability) flags |= RefreshFlags.CSharp | RefreshFlags.VB;

diff --git a/Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy/Settings/DecompilerSettingsImpl.cs b/Extensions/ILSpy.Decompiler/dnSpy.Decompiler.ILSpy/Settings/DecompilerSettingsImpl.cs
@@ -67,13 +67,13 @@ sealed class DecompilerSettingsImpl : DecompilerSettings {
 			SortMembers = sect.Attribute<bool?>(nameof(SortMembers)) ?? SortMembers;
 			ForceShowAllMembers = sect.Attribute<bool?>(nameof(ForceShowAllMembers)) ?? ForceShowAllMembers;
 			SortSystemUsingStatementsFirst = sect.Attribute<bool?>(nameof(SortSystemUsingStatementsFirst)) ?? SortSystemUsingStatementsFirst;
-			//MaxArrayElements = sect.Attribute<int?>(nameof(MaxArrayElements)) ?? MaxArrayElements;
+			MaxArrayElements = sect.Attribute<int?>(nameof(MaxArrayElements)) ?? MaxArrayElements;
 			SortCustomAttributes = sect.Attribute<bool?>(nameof(SortCustomAttributes)) ?? SortCustomAttributes;
 			UseSourceCodeOrder = sect.Attribute<bool?>(nameof(UseSourceCodeOrder)) ?? UseSourceCodeOrder;
 			AllowFieldInitializers = sect.Attribute<bool?>(nameof(AllowFieldInitializers)) ?? AllowFieldInitializers;
 			OneCustomAttributePerLine = sect.Attribute<bool?>(nameof(OneCustomAttributePerLine)) ?? OneCustomAttributePerLine;
-			// TypeAddInternalModifier = sect.Attribute<bool?>(nameof(TypeAddInternalModifier)) ?? TypeAddInternalModifier;
-			// MemberAddPrivateModifier = sect.Attribute<bool?>(nameof(MemberAddPrivateModifier)) ?? MemberAddPrivateModifier;
+			TypeAddInternalModifier = sect.Attribute<bool?>(nameof(TypeAddInternalModifier)) ?? TypeAddInternalModifier;
+			MemberAddPrivateModifier = sect.Attribute<bool?>(nameof(MemberAddPrivateModifier)) ?? MemberAddPrivateModifier;
 			// RemoveNewDelegateClass = sect.Attribute<bool?>(nameof(RemoveNewDelegateClass)) ?? RemoveNewDelegateClass;
 			HexadecimalNumbers = sect.Attribute<bool?>(nameof(HexadecimalNumbers)) ?? HexadecimalNumbers;
 			//EmitCalliAsInvocationExpression = sect.Attribute<bool?>(nameof(EmitCalliAsInvocationExpression)) ?? EmitCalliAsInvocationExpression;
@@ -119,13 +119,13 @@ protected override void OnModified() {
 			sect.Attribute(nameof(SortMembers), SortMembers);
 			sect.Attribute(nameof(ForceShowAllMembers), ForceShowAllMembers);
 			sect.Attribute(nameof(SortSystemUsingStatementsFirst), SortSystemUsingStatementsFirst);
-			//sect.Attribute(nameof(MaxArrayElements), MaxArrayElements);
+			sect.Attribute(nameof(MaxArrayElements), MaxArrayElements);
 			sect.Attribute(nameof(SortCustomAttributes), SortCustomAttributes);
 			sect.Attribute(nameof(UseSourceCodeOrder), UseSourceCodeOrder);
 			sect.Attribute(nameof(AllowFieldInitializers), AllowFieldInitializers);
 			sect.Attribute(nameof(OneCustomAttributePerLine), OneCustomAttributePerLine);
-			//sect.Attribute(nameof(TypeAddInternalModifier), TypeAddInternalModifier);
-			//sect.Attribute(nameof(MemberAddPrivateModifier), MemberAddPrivateModifier);
+			sect.Attribute(nameof(TypeAddInternalModifier), TypeAddInternalModifier);
+			sect.Attribute(nameof(MemberAddPrivateModifier), MemberAddPrivateModifier);
 			//sect.Attribute(nameof(RemoveNewDelegateClass), RemoveNewDelegateClass);
 			sect.Attribute(nameof(HexadecimalNumbers), HexadecimalNumbers);
 			//sect.Attribute(nameof(EmitCalliAsInvocationExpression), EmitCalliAsInvocationExpression);