diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index ec7725d5b..f370b6fbf 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -332,6 +332,7 @@ + diff --git a/ILSpy/Images/AccessOverlayIcon.cs b/ILSpy/Images/AccessOverlayIcon.cs index dbd04f00d..e0a63e9db 100644 --- a/ILSpy/Images/AccessOverlayIcon.cs +++ b/ILSpy/Images/AccessOverlayIcon.cs @@ -27,5 +27,6 @@ namespace ICSharpCode.ILSpy Internal, ProtectedInternal, Private, + CompilerControlled } } diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs index 6654a809a..18d392dab 100644 --- a/ILSpy/Images/Images.cs +++ b/ILSpy/Images/Images.cs @@ -95,6 +95,7 @@ namespace ICSharpCode.ILSpy private static readonly BitmapImage OverlayInternal = LoadBitmap("OverlayInternal"); private static readonly BitmapImage OverlayProtectedInternal = LoadBitmap("OverlayProtectedInternal"); private static readonly BitmapImage OverlayPrivate = LoadBitmap("OverlayPrivate"); + private static readonly BitmapImage OverlayCompilerControlled = LoadBitmap("OverlayCompilerControlled"); private static readonly BitmapImage OverlayStatic = LoadBitmap("OverlayStatic"); @@ -294,6 +295,9 @@ namespace ICSharpCode.ILSpy case AccessOverlayIcon.Private: overlayImage = Images.OverlayPrivate; break; + case AccessOverlayIcon.CompilerControlled: + overlayImage = Images.OverlayCompilerControlled; + break; default: throw new NotSupportedException(); } diff --git a/ILSpy/Images/OverlayCompilerControlled.png b/ILSpy/Images/OverlayCompilerControlled.png new file mode 100644 index 000000000..25a0f2ac9 Binary files /dev/null and b/ILSpy/Images/OverlayCompilerControlled.png differ diff --git a/ILSpy/TreeNodes/EventTreeNode.cs b/ILSpy/TreeNodes/EventTreeNode.cs index 2f585369c..e6517d639 100644 --- a/ILSpy/TreeNodes/EventTreeNode.cs +++ b/ILSpy/TreeNodes/EventTreeNode.cs @@ -86,10 +86,13 @@ namespace ICSharpCode.ILSpy.TreeNodes case MethodAttributes.FamANDAssem: return AccessOverlayIcon.Internal; case MethodAttributes.Family: - case MethodAttributes.FamORAssem: return AccessOverlayIcon.Protected; + case MethodAttributes.FamORAssem: + return AccessOverlayIcon.ProtectedInternal; case MethodAttributes.Private: return AccessOverlayIcon.Private; + case MethodAttributes.CompilerControlled: + return AccessOverlayIcon.CompilerControlled; default: throw new NotSupportedException(); } diff --git a/ILSpy/TreeNodes/FieldTreeNode.cs b/ILSpy/TreeNodes/FieldTreeNode.cs index 90942a7a9..e4cc535bd 100644 --- a/ILSpy/TreeNodes/FieldTreeNode.cs +++ b/ILSpy/TreeNodes/FieldTreeNode.cs @@ -93,10 +93,15 @@ namespace ICSharpCode.ILSpy.TreeNodes case FieldAttributes.FamANDAssem: return AccessOverlayIcon.Internal; case FieldAttributes.Family: - case FieldAttributes.FamORAssem: return AccessOverlayIcon.Protected; - default: + case FieldAttributes.FamORAssem: + return AccessOverlayIcon.ProtectedInternal; + case FieldAttributes.Private: return AccessOverlayIcon.Private; + case FieldAttributes.CompilerControlled: + return AccessOverlayIcon.CompilerControlled; + default: + throw new NotSupportedException(); } } diff --git a/ILSpy/TreeNodes/MethodTreeNode.cs b/ILSpy/TreeNodes/MethodTreeNode.cs index d16cce924..08f03451d 100644 --- a/ILSpy/TreeNodes/MethodTreeNode.cs +++ b/ILSpy/TreeNodes/MethodTreeNode.cs @@ -115,10 +115,13 @@ namespace ICSharpCode.ILSpy.TreeNodes case MethodAttributes.FamANDAssem: return AccessOverlayIcon.Internal; case MethodAttributes.Family: - case MethodAttributes.FamORAssem: return AccessOverlayIcon.Protected; + case MethodAttributes.FamORAssem: + return AccessOverlayIcon.ProtectedInternal; case MethodAttributes.Private: return AccessOverlayIcon.Private; + case MethodAttributes.CompilerControlled: + return AccessOverlayIcon.CompilerControlled; default: throw new NotSupportedException(); } diff --git a/ILSpy/TreeNodes/PropertyTreeNode.cs b/ILSpy/TreeNodes/PropertyTreeNode.cs index 4872b93e8..c1df925d4 100644 --- a/ILSpy/TreeNodes/PropertyTreeNode.cs +++ b/ILSpy/TreeNodes/PropertyTreeNode.cs @@ -87,10 +87,13 @@ namespace ICSharpCode.ILSpy.TreeNodes case MethodAttributes.FamANDAssem: return AccessOverlayIcon.Internal; case MethodAttributes.Family: - case MethodAttributes.FamORAssem: return AccessOverlayIcon.Protected; + case MethodAttributes.FamORAssem: + return AccessOverlayIcon.ProtectedInternal; case MethodAttributes.Private: return AccessOverlayIcon.Private; + case MethodAttributes.CompilerControlled: + return AccessOverlayIcon.CompilerControlled; default: throw new NotSupportedException(); }