Browse Source

Add ILSpy.SharpDevelop.LGPL project - LGPL files from SharpDevelop;

Move LGPL files from ILSpy to ILSpy.SharpDevelop.LGPL.
pull/263/head
Eusebiu Marcu 14 years ago
parent
commit
deaa0f2376
  1. 4
      Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
  2. 0
      ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextEditorListener.cs
  3. 0
      ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextMarker.cs
  4. 0
      ILSpy.SharpDevelop.LGPL/AvalonEdit/IToolTip.cs
  5. 25
      ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarManager.cs
  6. 2
      ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarMargin.cs
  7. 19
      ILSpy.SharpDevelop.LGPL/AvalonEdit/TextEditorWeakEventManager.cs
  8. 1
      ILSpy.SharpDevelop.LGPL/AvalonEdit/TextMarkerService.cs
  9. 0
      ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkBase.cs
  10. 0
      ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkEventHandler.cs
  11. 0
      ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkManager.cs
  12. 1
      ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmark.cs
  13. 0
      ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmarkEventArgs.cs
  14. 3
      ILSpy.SharpDevelop.LGPL/Bookmarks/CurrentLineBookmark.cs
  15. 0
      ILSpy.SharpDevelop.LGPL/Bookmarks/IBookmark.cs
  16. 0
      ILSpy.SharpDevelop.LGPL/Bookmarks/MarkerBookmark.cs
  17. 19
      ILSpy.SharpDevelop.LGPL/DebugInformation.cs
  18. 97
      ILSpy.SharpDevelop.LGPL/ILSpy.SharpDevelop.LGPL.csproj
  19. 35
      ILSpy.SharpDevelop.LGPL/Images.cs
  20. 31
      ILSpy.SharpDevelop.LGPL/Properties/AssemblyInfo.cs
  21. 12
      ILSpy.sln
  22. 19
      ILSpy/Bookmarks/MemberBookmark.cs
  23. 26
      ILSpy/ILSpy.csproj
  24. 4
      ILSpy/TextView/DecompilerTextView.cs

4
Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj

@ -145,6 +145,10 @@
<Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project> <Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
<Name>ICSharpCode.Decompiler</Name> <Name>ICSharpCode.Decompiler</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\ILSpy.SharpDevelop.LGPL\ILSpy.SharpDevelop.LGPL.csproj">
<Project>{704F66F1-5C7F-4326-A7AA-C604A3896D4E}</Project>
<Name>ILSpy.SharpDevelop.LGPL</Name>
</ProjectReference>
<ProjectReference Include="..\..\ILSpy\ILSpy.csproj"> <ProjectReference Include="..\..\ILSpy\ILSpy.csproj">
<Project>{1E85EFF9-E370-4683-83E4-8A3D063FF791}</Project> <Project>{1E85EFF9-E370-4683-83E4-8A3D063FF791}</Project>
<Name>ILSpy</Name> <Name>ILSpy</Name>

0
ILSpy/AvalonEdit/ITextEditorListener.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextEditorListener.cs

0
ILSpy/AvalonEdit/ITextMarker.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/ITextMarker.cs

0
ILSpy/AvalonEdit/IToolTip.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/IToolTip.cs

25
ILSpy/AvalonEdit/IconBarManager.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarManager.cs

@ -1,20 +1,5 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team // 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)
// 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;
using System.Collections.Generic; using System.Collections.Generic;
@ -57,7 +42,7 @@ namespace ICSharpCode.ILSpy.AvalonEdit
public event EventHandler RedrawRequested; public event EventHandler RedrawRequested;
internal void UpdateClassMemberBookmarks(IEnumerable<AstNode> nodes) public void UpdateClassMemberBookmarks(IEnumerable<AstNode> nodes, Type bookmarkType, Type memberType)
{ {
this.bookmarks.Clear(); this.bookmarks.Clear();
@ -68,10 +53,10 @@ namespace ICSharpCode.ILSpy.AvalonEdit
switch (n.NodeType) { switch (n.NodeType) {
case NodeType.TypeDeclaration: case NodeType.TypeDeclaration:
case NodeType.TypeReference: case NodeType.TypeReference:
this.bookmarks.Add(new TypeBookmark(n)); this.bookmarks.Add(Activator.CreateInstance(bookmarkType, n) as IBookmark);
break; break;
case NodeType.Member: case NodeType.Member:
this.bookmarks.Add(new MemberBookmark(n)); this.bookmarks.Add(Activator.CreateInstance(memberType, n) as IBookmark);
break; break;
default: default:
// do nothing // do nothing

2
ILSpy/AvalonEdit/IconBarMargin.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/IconBarMargin.cs

@ -187,7 +187,7 @@ namespace ICSharpCode.ILSpy.AvalonEdit
e.Handled = true; e.Handled = true;
} }
internal int GetLineFromMousePosition(MouseEventArgs e) public int GetLineFromMousePosition(MouseEventArgs e)
{ {
ICSharpCode.AvalonEdit.Rendering.TextView textView = this.TextView; ICSharpCode.AvalonEdit.Rendering.TextView textView = this.TextView;
if (textView == null) if (textView == null)

19
ILSpy/AvalonEdit/TextEditorWeakEventManager.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/TextEditorWeakEventManager.cs

@ -1,20 +1,5 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team // 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)
// 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;
using System.Windows; using System.Windows;

1
ILSpy/AvalonEdit/TextMarkerService.cs → ILSpy.SharpDevelop.LGPL/AvalonEdit/TextMarkerService.cs

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;

0
ILSpy/Bookmarks/BookmarkBase.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkBase.cs

0
ILSpy/Bookmarks/BookmarkEventHandler.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkEventHandler.cs

0
ILSpy/Bookmarks/BookmarkManager.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/BookmarkManager.cs

1
ILSpy/Bookmarks/BreakpointBookmark.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmark.cs

@ -7,6 +7,7 @@ using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.ILAst; using ICSharpCode.Decompiler.ILAst;
using ICSharpCode.ILSpy.AvalonEdit; using ICSharpCode.ILSpy.AvalonEdit;
using ICSharpCode.ILSpy.Bookmarks; using ICSharpCode.ILSpy.Bookmarks;
using ICSharpCode.ILSpy.SharpDevelop;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using Mono.Cecil; using Mono.Cecil;

0
ILSpy/Bookmarks/BreakpointBookmarkEventArgs.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/BreakpointBookmarkEventArgs.cs

3
ILSpy/Bookmarks/CurrentLineBookmark.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/CurrentLineBookmark.cs

@ -3,12 +3,11 @@
using System; using System;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Decompiler;
using ICSharpCode.ILSpy.AvalonEdit; using ICSharpCode.ILSpy.AvalonEdit;
using ICSharpCode.ILSpy.Bookmarks; using ICSharpCode.ILSpy.Bookmarks;
using ICSharpCode.ILSpy.SharpDevelop;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using Mono.Cecil; using Mono.Cecil;
using Mono.CSharp;
namespace ICSharpCode.ILSpy.Debugger.Bookmarks namespace ICSharpCode.ILSpy.Debugger.Bookmarks
{ {

0
ILSpy/Bookmarks/IBookmark.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/IBookmark.cs

0
ILSpy/Bookmarks/MarkerBookmark.cs → ILSpy.SharpDevelop.LGPL/Bookmarks/MarkerBookmark.cs

19
ILSpy/DebugInformation.cs → ILSpy.SharpDevelop.LGPL/DebugInformation.cs

@ -1,20 +1,5 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team // 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)
// 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;
using System.Collections.Concurrent; using System.Collections.Concurrent;

97
ILSpy.SharpDevelop.LGPL/ILSpy.SharpDevelop.LGPL.csproj

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{704F66F1-5C7F-4326-A7AA-C604A3896D4E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.ILSpy.SharpDevelop</RootNamespace>
<AssemblyName>ILSpy.SharpDevelop.LGPL</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AvalonEdit\IconBarManager.cs" />
<Compile Include="AvalonEdit\IconBarMargin.cs" />
<Compile Include="AvalonEdit\ITextEditorListener.cs" />
<Compile Include="AvalonEdit\ITextMarker.cs" />
<Compile Include="AvalonEdit\IToolTip.cs" />
<Compile Include="AvalonEdit\TextEditorWeakEventManager.cs" />
<Compile Include="AvalonEdit\TextMarkerService.cs" />
<Compile Include="Bookmarks\BookmarkBase.cs" />
<Compile Include="Bookmarks\BookmarkEventHandler.cs" />
<Compile Include="Bookmarks\BookmarkManager.cs" />
<Compile Include="Bookmarks\BreakpointBookmark.cs" />
<Compile Include="Bookmarks\BreakpointBookmarkEventArgs.cs" />
<Compile Include="Bookmarks\CurrentLineBookmark.cs" />
<Compile Include="Bookmarks\IBookmark.cs" />
<Compile Include="Bookmarks\MarkerBookmark.cs" />
<Compile Include="DebugInformation.cs" />
<Compile Include="Images.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="AvalonEdit" />
<Folder Include="Bookmarks" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
<Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
<Name>ICSharpCode.AvalonEdit</Name>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj">
<Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
<Name>ICSharpCode.Decompiler</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.Cecil\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>

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

31
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.*")]

12
ILSpy.sln

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # 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}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}"
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
doc\Command Line.txt = doc\Command Line.txt doc\Command Line.txt = doc\Command Line.txt
@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler", "ILS
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler\Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler\Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.SharpDevelop.LGPL", "ILSpy.SharpDevelop.LGPL\ILSpy.SharpDevelop.LGPL.csproj", "{704F66F1-5C7F-4326-A7AA-C604A3896D4E}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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}.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.Build.0 = Release|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.ActiveCfg = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

19
ILSpy/Bookmarks/MemberBookmark.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// 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;
using System.Windows; using System.Windows;

26
ILSpy/ILSpy.csproj

@ -94,26 +94,11 @@
</Compile> </Compile>
<Compile Include="AssemblyList.cs" /> <Compile Include="AssemblyList.cs" />
<Compile Include="AssemblyListManager.cs" /> <Compile Include="AssemblyListManager.cs" />
<Compile Include="AvalonEdit\ITextEditorListener.cs" />
<Compile Include="AvalonEdit\IToolTip.cs" />
<Compile Include="Bookmarks\BreakpointBookmark.cs" />
<Compile Include="Bookmarks\BreakpointBookmarkEventArgs.cs" />
<Compile Include="Bookmarks\CurrentLineBookmark.cs" />
<Compile Include="Commands\BrowseBackCommand.cs" />
<Compile Include="Commands\BrowseForwardCommand.cs" />
<Compile Include="AvalonEdit\IconBarManager.cs" />
<Compile Include="AvalonEdit\IconBarMargin.cs" />
<Compile Include="AvalonEdit\IconMarginActionsProvider.cs" /> <Compile Include="AvalonEdit\IconMarginActionsProvider.cs" />
<Compile Include="AvalonEdit\TextMarkerService.cs" />
<Compile Include="AvalonEdit\TextEditorWeakEventManager.cs" />
<Compile Include="AvalonEdit\ITextMarker.cs" />
<Compile Include="Bookmarks\BookmarkBase.cs" />
<Compile Include="Bookmarks\BookmarkEventHandler.cs" />
<Compile Include="Bookmarks\BookmarkManager.cs" />
<Compile Include="Bookmarks\Commands.cs" /> <Compile Include="Bookmarks\Commands.cs" />
<Compile Include="Bookmarks\MemberBookmark.cs" /> <Compile Include="Bookmarks\MemberBookmark.cs" />
<Compile Include="Bookmarks\IBookmark.cs" /> <Compile Include="Commands\BrowseBackCommand.cs" />
<Compile Include="Bookmarks\MarkerBookmark.cs" /> <Compile Include="Commands\BrowseForwardCommand.cs" />
<Compile Include="CommandLineArguments.cs" /> <Compile Include="CommandLineArguments.cs" />
<Compile Include="Commands\ExitCommand.cs" /> <Compile Include="Commands\ExitCommand.cs" />
<Compile Include="Commands\CommandWrapper.cs" /> <Compile Include="Commands\CommandWrapper.cs" />
@ -122,7 +107,6 @@
<Compile Include="Commands\ExportCommandAttribute.cs" /> <Compile Include="Commands\ExportCommandAttribute.cs" />
<Compile Include="Controls\SearchBox.cs" /> <Compile Include="Controls\SearchBox.cs" />
<Compile Include="Controls\SortableGridViewColumn.cs" /> <Compile Include="Controls\SortableGridViewColumn.cs" />
<Compile Include="DebugInformation.cs" />
<Compile Include="Languages\CSharpLanguage.cs" /> <Compile Include="Languages\CSharpLanguage.cs" />
<Compile Include="DecompilationOptions.cs" /> <Compile Include="DecompilationOptions.cs" />
<Compile Include="ExtensionMethods.cs" /> <Compile Include="ExtensionMethods.cs" />
@ -332,6 +316,10 @@
<Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project> <Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
<Name>ICSharpCode.Decompiler</Name> <Name>ICSharpCode.Decompiler</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\ILSpy.SharpDevelop.LGPL\ILSpy.SharpDevelop.LGPL.csproj">
<Project>{704F66F1-5C7F-4326-A7AA-C604A3896D4E}</Project>
<Name>ILSpy.SharpDevelop.LGPL</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.Cecil\Mono.Cecil.csproj"> <ProjectReference Include="..\Mono.Cecil\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project> <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name> <Name>Mono.Cecil</Name>
@ -362,8 +350,6 @@
<ItemGroup> <ItemGroup>
<Folder Include="AvalonEdit" /> <Folder Include="AvalonEdit" />
<Folder Include="Bookmarks" /> <Folder Include="Bookmarks" />
</ItemGroup>
<ItemGroup>
<Folder Include="Options" /> <Folder Include="Options" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

4
ILSpy/TextView/DecompilerTextView.cs

@ -547,7 +547,7 @@ namespace ICSharpCode.ILSpy.TextView
void Language_DecompileFinished(object sender, DecompileEventArgs e) void Language_DecompileFinished(object sender, DecompileEventArgs e)
{ {
if (e != null) { if (e != null) {
manager.UpdateClassMemberBookmarks(e.AstNodes); manager.UpdateClassMemberBookmarks(e.AstNodes, typeof(TypeBookmark), typeof(MemberBookmark));
if (iconMargin.DecompiledMembers == null) { if (iconMargin.DecompiledMembers == null) {
iconMargin.DecompiledMembers = new List<MemberReference>(); iconMargin.DecompiledMembers = new List<MemberReference>();
} }
@ -565,7 +565,7 @@ namespace ICSharpCode.ILSpy.TextView
DebugInformation.LocalVariables.AddRange(e.LocalVariables); DebugInformation.LocalVariables.AddRange(e.LocalVariables);
} }
} else { } else {
manager.UpdateClassMemberBookmarks(null); manager.UpdateClassMemberBookmarks(null, typeof(TypeBookmark), typeof(MemberBookmark));
} }
} }

Loading…
Cancel
Save