Browse Source

Fix #294: Exception on creation of tree node with 'privatescope' visibility

pull/285/merge
Ed Harvey 14 years ago
parent
commit
abdf59560c
  1. 1
      ILSpy/ILSpy.csproj
  2. 1
      ILSpy/Images/AccessOverlayIcon.cs
  3. 4
      ILSpy/Images/Images.cs
  4. BIN
      ILSpy/Images/OverlayCompilerControlled.png
  5. 5
      ILSpy/TreeNodes/EventTreeNode.cs
  6. 9
      ILSpy/TreeNodes/FieldTreeNode.cs
  7. 5
      ILSpy/TreeNodes/MethodTreeNode.cs
  8. 5
      ILSpy/TreeNodes/PropertyTreeNode.cs

1
ILSpy/ILSpy.csproj

@ -332,6 +332,7 @@ @@ -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" />

1
ILSpy/Images/AccessOverlayIcon.cs

@ -27,5 +27,6 @@ namespace ICSharpCode.ILSpy @@ -27,5 +27,6 @@ namespace ICSharpCode.ILSpy
Internal,
ProtectedInternal,
Private,
CompilerControlled
}
}

4
ILSpy/Images/Images.cs

@ -95,6 +95,7 @@ namespace ICSharpCode.ILSpy @@ -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 @@ -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();
}

BIN
ILSpy/Images/OverlayCompilerControlled.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

5
ILSpy/TreeNodes/EventTreeNode.cs

@ -86,10 +86,13 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -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();
}

9
ILSpy/TreeNodes/FieldTreeNode.cs

@ -93,10 +93,15 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -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();
}
}

5
ILSpy/TreeNodes/MethodTreeNode.cs

@ -115,10 +115,13 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -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();
}

5
ILSpy/TreeNodes/PropertyTreeNode.cs

@ -87,10 +87,13 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -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();
}

Loading…
Cancel
Save