Fix: #3407 Add "private protected" feature for 7.2 decompiler options

Author: siegfriedpammer

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -528,6 +528,7 @@ static TypeSystemAstBuilder CreateAstBuilder(DecompilerSettings settings)
 		{
 			var typeSystemAstBuilder = new TypeSystemAstBuilder();
 			typeSystemAstBuilder.ShowAttributes = true;
+			typeSystemAstBuilder.UsePrivateProtectedAccessibility = settings.IntroducePrivateProtectedAccessibility;
 			typeSystemAstBuilder.SortAttributes = settings.SortCustomAttributes;
 			typeSystemAstBuilder.AlwaysUseShortTypeNames = true;
 			typeSystemAstBuilder.AddResolveResultAnnotations = true;

ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs

@@ -236,6 +236,7 @@ TypeSystemAstBuilder CreateAstBuilder()
 			astBuilder.ShowTypeParametersForUnboundTypes = true;
 			astBuilder.ShowModifiers = (ConversionFlags & ConversionFlags.ShowModifiers) == ConversionFlags.ShowModifiers;
 			astBuilder.ShowAccessibility = (ConversionFlags & ConversionFlags.ShowAccessibility) == ConversionFlags.ShowAccessibility;
+			astBuilder.UsePrivateProtectedAccessibility = (ConversionFlags & ConversionFlags.UsePrivateProtectedAccessibility) == ConversionFlags.UsePrivateProtectedAccessibility;
 			astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) != ConversionFlags.UseFullyQualifiedTypeNames;
 			astBuilder.ShowParameterNames = (ConversionFlags & ConversionFlags.ShowParameterNames) == ConversionFlags.ShowParameterNames;
 			astBuilder.UseNullableSpecifierForValueTypes = (ConversionFlags & ConversionFlags.UseNullableSpecifierForValueTypes) != 0;

ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs

@@ -70,6 +70,7 @@ void InitProperties()
 			this.UseKeywordsForBuiltinTypes = true;
 			this.UseNullableSpecifierForValueTypes = true;
 			this.ShowAccessibility = true;
+			this.UsePrivateProtectedAccessibility = true;
 			this.ShowModifiers = true;
 			this.ShowBaseTypes = true;
 			this.ShowTypeParameters = true;
@@ -93,13 +94,19 @@ void InitProperties()
 		public bool AddResolveResultAnnotations { get; set; }
 
 		/// <summary>
-		/// Controls the accessibility modifiers are shown.
+		/// Controls whether accessibility modifiers are shown.
 		/// The default value is <see langword="true" />.
 		/// </summary>
 		public bool ShowAccessibility { get; set; }
 
 		/// <summary>
-		/// Controls the non-accessibility modifiers are shown.
+		/// Controls whether "private protected" accessibility modifiers are shown.
+		/// The default value is <see langword="true" />.
+		/// </summary>
+		public bool UsePrivateProtectedAccessibility { get; set; }
+
+		/// <summary>
+		/// Controls whether non-accessibility modifiers are shown.
 		/// The default value is <see langword="true" />.
 		/// </summary>
 		public bool ShowModifiers { get; set; }
@@ -1805,7 +1812,7 @@ EntityDeclaration ConvertTypeDefinition(ITypeDefinition typeDefinition)
 			Modifiers modifiers = Modifiers.None;
 			if (this.ShowAccessibility)
 			{
-				modifiers |= ModifierFromAccessibility(typeDefinition.Accessibility);
+				modifiers |= ModifierFromAccessibility(typeDefinition.Accessibility, UsePrivateProtectedAccessibility);
 			}
 			if (this.ShowModifiers)
 			{
@@ -2073,7 +2080,7 @@ Accessor ConvertAccessor(IMethod accessor, MethodSemanticsAttributes kind, Acces
 				}
 			}
 			if (this.ShowAccessibility && accessor.Accessibility != ownerAccessibility)
-				decl.Modifiers = ModifierFromAccessibility(accessor.Accessibility);
+				decl.Modifiers = ModifierFromAccessibility(accessor.Accessibility, UsePrivateProtectedAccessibility);
 			if (this.ShowModifiers && accessor.HasReadonlyModifier())
 				decl.Modifiers |= Modifiers.Readonly;
 			TokenRole keywordRole = kind switch {
@@ -2342,7 +2349,7 @@ DestructorDeclaration ConvertDestructor(IMethod dtor)
 		#endregion
 
 		#region Convert Modifiers
-		public static Modifiers ModifierFromAccessibility(Accessibility accessibility)
+		public static Modifiers ModifierFromAccessibility(Accessibility accessibility, bool usePrivateProtected)
 		{
 			switch (accessibility)
 			{
@@ -2357,7 +2364,7 @@ public static Modifiers ModifierFromAccessibility(Accessibility accessibility)
 				case Accessibility.ProtectedOrInternal:
 					return Modifiers.Protected | Modifiers.Internal;
 				case Accessibility.ProtectedAndInternal:
-					return Modifiers.Private | Modifiers.Protected;
+					return usePrivateProtected ? Modifiers.Private | Modifiers.Protected : Modifiers.Protected;
 				default:
 					return Modifiers.None;
 			}
@@ -2388,7 +2395,7 @@ Modifiers GetMemberModifiers(IMember member)
 			Modifiers m = Modifiers.None;
 			if (this.ShowAccessibility && NeedsAccessibility(member))
 			{
-				m |= ModifierFromAccessibility(member.Accessibility);
+				m |= ModifierFromAccessibility(member.Accessibility, UsePrivateProtectedAccessibility);
 			}
 			if (this.ShowModifiers)
 			{

ICSharpCode.Decompiler/DecompilerSettings.cs

@@ -112,6 +112,7 @@ public void SetLanguageVersion(CSharp.LanguageVersion languageVersion)
 				introduceRefModifiersOnStructs = false;
 				nonTrailingNamedArguments = false;
 				refExtensionMethods = false;
+				introducePrivateProtectedAccessibilty = false;
 			}
 			if (languageVersion < CSharp.LanguageVersion.CSharp7_3)
 			{
@@ -185,7 +186,7 @@ public CSharp.LanguageVersion GetMinimumRequiredVersion()
 				|| patternBasedFixedStatement)
 				return CSharp.LanguageVersion.CSharp7_3;
 			if (introduceRefModifiersOnStructs || introduceReadonlyAndInModifiers
-				|| nonTrailingNamedArguments || refExtensionMethods)
+				|| nonTrailingNamedArguments || refExtensionMethods || introducePrivateProtectedAccessibilty)
 				return CSharp.LanguageVersion.CSharp7_2;
 			// C# 7.1 missing
 			if (outVariables || throwExpressions || tupleTypes || tupleConversions
@@ -1418,6 +1419,24 @@ public bool IntroduceReadonlyAndInModifiers {
 			}
 		}
 
+		bool introducePrivateProtectedAccessibilty = true;
+
+		/// <summary>
+		/// Gets/Sets whether "private protected" should be used.
+		/// </summary>
+		[Category("C# 7.2 / VS 2017.4")]
+		[Description("DecompilerSettings.IntroducePrivateProtectedAccessibility")]
+		public bool IntroducePrivateProtectedAccessibility {
+			get { return introducePrivateProtectedAccessibilty; }
+			set {
+				if (introducePrivateProtectedAccessibilty != value)
+				{
+					introducePrivateProtectedAccessibilty = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		bool readOnlyMethods = true;
 
 		[Category("C# 8.0 / VS 2019")]

ICSharpCode.Decompiler/Output/IAmbience.cs

@@ -117,9 +117,14 @@ public enum ConversionFlags
 		/// Support C# 11 <c>operator checked</c>.
 		/// </summary>
 		SupportOperatorChecked = 0x100000,
+		/// <summary>
+		/// Support C# 7.2 <c>private protected</c>.
+		/// </summary>
+		UsePrivateProtectedAccessibility = 0x200000,
 
 		StandardConversionFlags = ShowParameterNames |
 			ShowAccessibility |
+			UsePrivateProtectedAccessibility |
 			ShowParameterList |
 			ShowParameterModifiers |
 			ShowParameterDefaultValues |

ILSpy/Properties/Resources.Designer.cs

@@ -595,7 +595,7 @@ Are you sure you want to continue?</value>
     <value>Enable folding on all blocks in braces</value>
   </data>
   <data name="EnableSmoothScrolling" xml:space="preserve">
-	  <value>Enable smooth scrolling</value>
+    <value>Enable smooth scrolling</value>
   </data>
   <data name="EnableWordWrap" xml:space="preserve">
     <value>Enable word wrap</value>
@@ -1108,4 +1108,7 @@ Do you want to continue?</value>
   <data name="_Window" xml:space="preserve">
     <value>_Window</value>
   </data>
+  <data name="DecompilerSettings.IntroducePrivateProtectedAccessibility" xml:space="preserve">
+    <value>Introduce 'private protected' accessibility</value>
+  </data>
 </root>

ILSpy/Properties/Resources.resx

@@ -369,6 +369,9 @@
   <data name="DecompilerSettings.IntroduceLocalFunctions" xml:space="preserve">
     <value>引入局部函数(local functions)</value>
   </data>
+  <data name="DecompilerSettings.IntroducePrivateProtectedAccessibility" xml:space="preserve">
+    <value />
+  </data>
   <data name="DecompilerSettings.IntroduceStaticLocalFunctions" xml:space="preserve">
     <value>引入静态局部函数(static local functions)</value>
   </data>