From abdf59560ce55c7799f464fba637f3d61db7da9f Mon Sep 17 00:00:00 2001
From: Ed Harvey <edharvey@optusnet.com.au>
Date: Fri, 25 Nov 2011 12:46:33 +1100
Subject: [PATCH] Fix #294: Exception on creation of tree node with
 'privatescope' visibility

---
 ILSpy/ILSpy.csproj                         |   1 +
 ILSpy/Images/AccessOverlayIcon.cs          |   1 +
 ILSpy/Images/Images.cs                     |   4 ++++
 ILSpy/Images/OverlayCompilerControlled.png | Bin 0 -> 474 bytes
 ILSpy/TreeNodes/EventTreeNode.cs           |   5 ++++-
 ILSpy/TreeNodes/FieldTreeNode.cs           |   9 +++++++--
 ILSpy/TreeNodes/MethodTreeNode.cs          |   5 ++++-
 ILSpy/TreeNodes/PropertyTreeNode.cs        |   5 ++++-
 8 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 ILSpy/Images/OverlayCompilerControlled.png

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 @@
     <Resource Include="Images\OverlayPrivate.png" />
     <Resource Include="Images\OverlayProtected.png" />
     <Resource Include="Images\OverlayProtectedInternal.png" />
+    <Resource Include="Images\OverlayCompilerControlled.png" />
     <Resource Include="Images\OverlayStatic.png" />
     <Resource Include="Images\VirtualMethod.png" />
     <Resource Include="Images\PInvokeMethod.png" />
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 0000000000000000000000000000000000000000..25a0f2ac969c0e7c265ec0e3c9a39b2ff9ea6645
GIT binary patch
literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O$
zeEU(80000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}00009
za7bBm000tj000tj0U?{1Y5)KL7IZ~ebW?9;ba!ELWdLwtX>N2bZe?^JG%heZ==Es;
z00AyZL_t(IPh<H1|33pIm?F&}i$@I@6k%{bKAz)JmRH#ALjT=&ivm7gPj$F=B-CWa
zx&U)cpaU5Rr4a^@=I0G@@BhrN|NnnV;s1Z--v8f+Yy98hq<na;hk+<T18(Q}?EW*Y
z?En8cwg3NgrvCq4<njM)vc>=7CR{)J&6UFm8gQ?`=i~qSkpKVRKL7vk)#LwvZl3-B
zVdbR%XN*|>S7}Lh6ExsTw8{NHk!t^c9$5GP>!x}CKP>F{|DY-L|2{qDe_65uRRj&#
z@25NCz76mHr_MtEZ`tzxKWEMbbUx?*=}Ihb0);p&2pX^^$XH{&qx|9hMjStm8?gM}
ztHb<nx)Sr7FmBcsdj<v$f(C%13KZJi=1LJYKtF?=9U{bM2GYy`1cVF#0FME{88-@|
QjQ{`u07*qoM6N<$f*9Y?)c^nh

literal 0
HcmV?d00001

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();
 			}