diff --git a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj index 888f73d79..2ecba2d72 100644 --- a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj +++ b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj @@ -145,6 +145,10 @@ {984CC812-9470-4A13-AFF9-CC44068D666C} ICSharpCode.Decompiler + + {704F66F1-5C7F-4326-A7AA-C604A3896D4E} + ILSpy.SharpDevelop.LGPL + {1E85EFF9-E370-4683-83E4-8A3D063FF791} ILSpy diff --git a/ILSpy/AvalonEdit/ITextEditorListener.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextEditorListener.cs similarity index 100% rename from ILSpy/AvalonEdit/ITextEditorListener.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextEditorListener.cs diff --git a/ILSpy/AvalonEdit/ITextMarker.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextMarker.cs similarity index 100% rename from ILSpy/AvalonEdit/ITextMarker.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextMarker.cs diff --git a/ILSpy/AvalonEdit/IToolTip.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/IToolTip.cs similarity index 100% rename from ILSpy/AvalonEdit/IToolTip.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/IToolTip.cs diff --git a/ILSpy/AvalonEdit/IconBarManager.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarManager.cs similarity index 50% rename from ILSpy/AvalonEdit/IconBarManager.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarManager.cs index 3677df10b..b39a0ebd8 100644 --- a/ILSpy/AvalonEdit/IconBarManager.cs +++ b/ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarManager.cs @@ -1,20 +1,5 @@ -// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; @@ -57,7 +42,7 @@ namespace ICSharpCode.ILSpy.AvalonEdit public event EventHandler RedrawRequested; - internal void UpdateClassMemberBookmarks(IEnumerable nodes) + public void UpdateClassMemberBookmarks(IEnumerable nodes, Type bookmarkType, Type memberType) { this.bookmarks.Clear(); @@ -68,10 +53,10 @@ namespace ICSharpCode.ILSpy.AvalonEdit switch (n.NodeType) { case NodeType.TypeDeclaration: case NodeType.TypeReference: - this.bookmarks.Add(new TypeBookmark(n)); + this.bookmarks.Add(Activator.CreateInstance(bookmarkType, n) as IBookmark); break; case NodeType.Member: - this.bookmarks.Add(new MemberBookmark(n)); + this.bookmarks.Add(Activator.CreateInstance(memberType, n) as IBookmark); break; default: // do nothing diff --git a/ILSpy/AvalonEdit/IconBarMargin.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarMargin.cs similarity index 99% rename from ILSpy/AvalonEdit/IconBarMargin.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarMargin.cs index 135ca8f98..907c1a137 100644 --- a/ILSpy/AvalonEdit/IconBarMargin.cs +++ b/ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarMargin.cs @@ -187,7 +187,7 @@ namespace ICSharpCode.ILSpy.AvalonEdit e.Handled = true; } - internal int GetLineFromMousePosition(MouseEventArgs e) + public int GetLineFromMousePosition(MouseEventArgs e) { ICSharpCode.AvalonEdit.Rendering.TextView textView = this.TextView; if (textView == null) diff --git a/ILSpy/AvalonEdit/TextEditorWeakEventManager.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/TextEditorWeakEventManager.cs similarity index 50% rename from ILSpy/AvalonEdit/TextEditorWeakEventManager.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/TextEditorWeakEventManager.cs index 2074763d8..864ad5e3d 100644 --- a/ILSpy/AvalonEdit/TextEditorWeakEventManager.cs +++ b/ILSpy.SharpDevelop.LGPL/AvalonEdit/TextEditorWeakEventManager.cs @@ -1,20 +1,5 @@ -// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows; diff --git a/ILSpy/AvalonEdit/TextMarkerService.cs b/ILSpy.SharpDevelop.LGPL/AvalonEdit/TextMarkerService.cs similarity index 99% rename from ILSpy/AvalonEdit/TextMarkerService.cs rename to ILSpy.SharpDevelop.LGPL/AvalonEdit/TextMarkerService.cs index caffc37ac..40abc720a 100644 --- a/ILSpy/AvalonEdit/TextMarkerService.cs +++ b/ILSpy.SharpDevelop.LGPL/AvalonEdit/TextMarkerService.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Windows; using System.Windows.Media; diff --git a/ILSpy/Bookmarks/BookmarkBase.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkBase.cs similarity index 100% rename from ILSpy/Bookmarks/BookmarkBase.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkBase.cs diff --git a/ILSpy/Bookmarks/BookmarkEventHandler.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkEventHandler.cs similarity index 100% rename from ILSpy/Bookmarks/BookmarkEventHandler.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkEventHandler.cs diff --git a/ILSpy/Bookmarks/BookmarkManager.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkManager.cs similarity index 100% rename from ILSpy/Bookmarks/BookmarkManager.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkManager.cs diff --git a/ILSpy/Bookmarks/BreakpointBookmark.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmark.cs similarity index 98% rename from ILSpy/Bookmarks/BreakpointBookmark.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmark.cs index ab5f95056..9212a4adb 100644 --- a/ILSpy/Bookmarks/BreakpointBookmark.cs +++ b/ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmark.cs @@ -7,6 +7,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.ILAst; using ICSharpCode.ILSpy.AvalonEdit; using ICSharpCode.ILSpy.Bookmarks; +using ICSharpCode.ILSpy.SharpDevelop; using ICSharpCode.NRefactory.CSharp; using Mono.Cecil; diff --git a/ILSpy/Bookmarks/BreakpointBookmarkEventArgs.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmarkEventArgs.cs similarity index 100% rename from ILSpy/Bookmarks/BreakpointBookmarkEventArgs.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmarkEventArgs.cs diff --git a/ILSpy/Bookmarks/CurrentLineBookmark.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/CurrentLineBookmark.cs similarity index 98% rename from ILSpy/Bookmarks/CurrentLineBookmark.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/CurrentLineBookmark.cs index 51934a0e5..f7772a642 100644 --- a/ILSpy/Bookmarks/CurrentLineBookmark.cs +++ b/ILSpy.SharpDevelop.LGPL/Bookmarks/CurrentLineBookmark.cs @@ -3,12 +3,11 @@ using System; using System.Windows.Media; -using ICSharpCode.Decompiler; using ICSharpCode.ILSpy.AvalonEdit; using ICSharpCode.ILSpy.Bookmarks; +using ICSharpCode.ILSpy.SharpDevelop; using ICSharpCode.NRefactory.CSharp; using Mono.Cecil; -using Mono.CSharp; namespace ICSharpCode.ILSpy.Debugger.Bookmarks { diff --git a/ILSpy/Bookmarks/IBookmark.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/IBookmark.cs similarity index 100% rename from ILSpy/Bookmarks/IBookmark.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/IBookmark.cs diff --git a/ILSpy/Bookmarks/MarkerBookmark.cs b/ILSpy.SharpDevelop.LGPL/Bookmarks/MarkerBookmark.cs similarity index 100% rename from ILSpy/Bookmarks/MarkerBookmark.cs rename to ILSpy.SharpDevelop.LGPL/Bookmarks/MarkerBookmark.cs diff --git a/ILSpy/DebugInformation.cs b/ILSpy.SharpDevelop.LGPL/DebugInformation.cs similarity index 70% rename from ILSpy/DebugInformation.cs rename to ILSpy.SharpDevelop.LGPL/DebugInformation.cs index 260c638c9..8c6aa4390 100644 --- a/ILSpy/DebugInformation.cs +++ b/ILSpy.SharpDevelop.LGPL/DebugInformation.cs @@ -1,20 +1,5 @@ -// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Concurrent; diff --git a/ILSpy.SharpDevelop.LGPL/ILSpy.SharpDevelop.LGPL.csproj b/ILSpy.SharpDevelop.LGPL/ILSpy.SharpDevelop.LGPL.csproj new file mode 100644 index 000000000..91ab87eb4 --- /dev/null +++ b/ILSpy.SharpDevelop.LGPL/ILSpy.SharpDevelop.LGPL.csproj @@ -0,0 +1,97 @@ + + + + {704F66F1-5C7F-4326-A7AA-C604A3896D4E} + Debug + x86 + Library + ICSharpCode.ILSpy.SharpDevelop + ILSpy.SharpDevelop.LGPL + v4.0 + Properties + + + x86 + + + bin\Debug\ + True + Full + False + True + DEBUG;TRACE + + + bin\Release\ + False + None + True + False + TRACE + + + + 3.0 + + + 3.0 + + + + 3.5 + + + 4.0 + + + + 3.5 + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} + ICSharpCode.AvalonEdit + + + {984CC812-9470-4A13-AFF9-CC44068D666C} + ICSharpCode.Decompiler + + + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} + Mono.Cecil + + + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} + ICSharpCode.NRefactory + + + + \ No newline at end of file diff --git a/ILSpy.SharpDevelop.LGPL/Images.cs b/ILSpy.SharpDevelop.LGPL/Images.cs new file mode 100644 index 000000000..50915ab48 --- /dev/null +++ b/ILSpy.SharpDevelop.LGPL/Images.cs @@ -0,0 +1,35 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Windows.Media; +using System.Windows.Media.Imaging; + +namespace ICSharpCode.ILSpy.SharpDevelop +{ + static class Images + { + static BitmapImage LoadBitmap(string name) + { + try { + BitmapImage image = new BitmapImage(new Uri("pack://application:,,,/ILSpy;component/Images/" + name + ".png")); + if (image == null) + return null; + image.Freeze(); + return image; + } + catch { + // resource not found + return null; + } + } + + public static readonly BitmapImage Breakpoint = LoadBitmap("Breakpoint"); + public static readonly BitmapImage CurrentLine = LoadBitmap("CurrentLine"); + + public static ImageSource GetImage(string imageName) + { + return LoadBitmap(imageName); + } + } +} diff --git a/ILSpy.SharpDevelop.LGPL/Properties/AssemblyInfo.cs b/ILSpy.SharpDevelop.LGPL/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..edada9d2e --- /dev/null +++ b/ILSpy.SharpDevelop.LGPL/Properties/AssemblyInfo.cs @@ -0,0 +1,31 @@ +#region Using directives + +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +#endregion + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ILSpy.SharpDevelop.LGPL")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ILSpy.SharpDevelop.LGPL")] +[assembly: AssemblyCopyright("Copyright 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all the values or you can use the default the Revision and +// Build Numbers by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.*")] diff --git a/ILSpy.sln b/ILSpy.sln index 3888446b9..23816c163 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.1.0.7590-alpha +# SharpDevelop 4.1.0.7595-alpha Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}" ProjectSection(SolutionItems) = postProject doc\Command Line.txt = doc\Command Line.txt @@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler", "ILS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler\Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.SharpDevelop.LGPL", "ILSpy.SharpDevelop.LGPL\ILSpy.SharpDevelop.LGPL.csproj", "{704F66F1-5C7F-4326-A7AA-C604A3896D4E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -141,6 +143,14 @@ Global {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.Build.0 = Release|Any CPU {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Debug|Any CPU.Build.0 = Debug|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Debug|x86.Build.0 = Debug|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Debug|x86.ActiveCfg = Debug|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Release|Any CPU.Build.0 = Release|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Release|Any CPU.ActiveCfg = Release|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Release|x86.Build.0 = Release|x86 + {704F66F1-5C7F-4326-A7AA-C604A3896D4E}.Release|x86.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ILSpy/Bookmarks/MemberBookmark.cs b/ILSpy/Bookmarks/MemberBookmark.cs index 646587ae6..46a52d3d2 100644 --- a/ILSpy/Bookmarks/MemberBookmark.cs +++ b/ILSpy/Bookmarks/MemberBookmark.cs @@ -1,5 +1,20 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) +// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. using System; using System.Windows; diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index bfd49d1e1..bbfc2b14b 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -94,26 +94,11 @@ - - - - - - - - - - - - - - - - - + + @@ -122,7 +107,6 @@ - @@ -332,6 +316,10 @@ {984CC812-9470-4A13-AFF9-CC44068D666C} ICSharpCode.Decompiler + + {704F66F1-5C7F-4326-A7AA-C604A3896D4E} + ILSpy.SharpDevelop.LGPL + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil @@ -362,8 +350,6 @@ - - diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs index d472ce210..601927e85 100644 --- a/ILSpy/TextView/DecompilerTextView.cs +++ b/ILSpy/TextView/DecompilerTextView.cs @@ -547,7 +547,7 @@ namespace ICSharpCode.ILSpy.TextView void Language_DecompileFinished(object sender, DecompileEventArgs e) { if (e != null) { - manager.UpdateClassMemberBookmarks(e.AstNodes); + manager.UpdateClassMemberBookmarks(e.AstNodes, typeof(TypeBookmark), typeof(MemberBookmark)); if (iconMargin.DecompiledMembers == null) { iconMargin.DecompiledMembers = new List(); } @@ -565,7 +565,7 @@ namespace ICSharpCode.ILSpy.TextView DebugInformation.LocalVariables.AddRange(e.LocalVariables); } } else { - manager.UpdateClassMemberBookmarks(null); + manager.UpdateClassMemberBookmarks(null, typeof(TypeBookmark), typeof(MemberBookmark)); } }