Fix icsharpcode#2484: Private modifier incorrectly applied to interfa…

…ce static constructors
dnSpyEx · Nov 6, 2021 · f593880 · f593880
1 parent d450865
commit f593880
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/InterfaceTests.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/InterfaceTests.cs
@@ -39,6 +39,11 @@ int Property3 {
 			void Method();
 
 #if CS80
+			static IA()
+			{
+
+			}
+
 			void DefaultMethod()
 			{
 				Method();

diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs
@@ -1995,18 +1995,18 @@ bool NeedsAccessibility(IMember member)
 			var declaringType = member.DeclaringType;
 			if (member.IsExplicitInterfaceImplementation)
 				return false;
-			if (declaringType != null && declaringType.Kind == TypeKind.Interface) {
-				return member.Accessibility != Accessibility.Public;
-			}
-			switch (member.SymbolKind) {
+			switch (member.SymbolKind)
+			{
 				case SymbolKind.Constructor:
 					return !member.IsStatic;
 				case SymbolKind.Destructor:
 					return false;
-				case SymbolKind.Method:
-					return !((IMethod)member).IsLocalFunction;
 				default:
-					return true;
+					if (declaringType?.Kind == TypeKind.Interface)
+					{
+						return member.Accessibility != Accessibility.Public;
+					}
+					return member is not IMethod method || !method.IsLocalFunction;
 			}
 		}