From a731d68963088096a8f4179d43e4c684c4bf06ae Mon Sep 17 00:00:00 2001
From: Eusebiu Marcu <marcueusebiu@gmail.com>
Date: Thu, 24 Feb 2011 20:15:49 +0200
Subject: [PATCH] Remove all breakpoints.

---
 .../AvalonEdit/IconBarMargin.cs               |   3 +++
 Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj |  14 ++++++++++-
 .../Images/ContinueDebugging.png              | Bin
 .../Images/DeleteAllBreakpoints.PNG           | Bin 0 -> 924 bytes
 .../ILSpy.Debugger}/Images/StepInto.png       | Bin
 .../ILSpy.Debugger}/Images/StepOut.png        | Bin
 .../ILSpy.Debugger}/Images/StepOver.png       | Bin
 .../ILSpy.Debugger}/Images/bug.png            | Bin
 ICSharpCode.Decompiler/Ast/AstBuilder.cs      |   3 ++-
 ILSpy.sln                                     |   8 +++----
 ILSpy/Commands/RoutedUICommands.cs            |   4 ++++
 ILSpy/ILSpy.csproj                            |   5 ----
 ILSpy/MainWindow.xaml                         |  22 +++++++++++++-----
 ILSpy/MainWindow.xaml.cs                      |  11 +++++++++
 14 files changed, 53 insertions(+), 17 deletions(-)
 rename {ILSpy => Debugger/ILSpy.Debugger}/Images/ContinueDebugging.png (100%)
 create mode 100644 Debugger/ILSpy.Debugger/Images/DeleteAllBreakpoints.PNG
 rename {ILSpy => Debugger/ILSpy.Debugger}/Images/StepInto.png (100%)
 rename {ILSpy => Debugger/ILSpy.Debugger}/Images/StepOut.png (100%)
 rename {ILSpy => Debugger/ILSpy.Debugger}/Images/StepOver.png (100%)
 rename {ILSpy => Debugger/ILSpy.Debugger}/Images/bug.png (100%)

diff --git a/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs b/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs
index 2897bbcd5..98876d212 100644
--- a/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs
+++ b/Debugger/ILSpy.Debugger/AvalonEdit/IconBarMargin.cs
@@ -210,6 +210,9 @@ namespace ILSpy.Debugger.AvalonEdit
 				InvalidateVisual();
 			}
 			
+			if (CurrentType == null)
+				return;
+			
 			BreakpointBookmark bm = BookmarkManager.Bookmarks.Find(
 				b => b.TypeName == CurrentType.FullName &&
 				b.LineNumber == GetLineFromMousePosition(e)
diff --git a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
index 8d2e7c506..9ae1302ab 100644
--- a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
+++ b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
@@ -137,7 +137,7 @@
   <ItemGroup>
     <Resource Include="Images\Breakpoint.png" />
     <Resource Include="Images\CurrentLine.png" />
-    <Resource Include="Images\Icons.16x16.Class.png"/>
+    <Resource Include="Images\Icons.16x16.Class.png" />
     <Resource Include="Images\Icons.16x16.Delegate.png" />
     <Resource Include="Images\Icons.16x16.Enum.png" />
     <Resource Include="Images\Icons.16x16.Event.png" />
@@ -189,5 +189,17 @@
     <Resource Include="Images\Icons.16x16.Reference.png" />
     <Resource Include="Images\Icons.16x16.Struct.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DeleteAllBreakpoints.PNG" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\bug.png" />
+    <Resource Include="Images\ContinueDebugging.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\StepInto.png" />
+    <Resource Include="Images\StepOut.png" />
+    <Resource Include="Images\StepOver.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/ILSpy/Images/ContinueDebugging.png b/Debugger/ILSpy.Debugger/Images/ContinueDebugging.png
similarity index 100%
rename from ILSpy/Images/ContinueDebugging.png
rename to Debugger/ILSpy.Debugger/Images/ContinueDebugging.png
diff --git a/Debugger/ILSpy.Debugger/Images/DeleteAllBreakpoints.PNG b/Debugger/ILSpy.Debugger/Images/DeleteAllBreakpoints.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..9f1007b8ed8d86f98c810300e41ab77188ffd05d
GIT binary patch
literal 924
zcmV;N17rM&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP0000PbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQHA#y6-~a#vE=fc|R5(v{
zlY2~4R~*OhU7XosHr<xR#~;R+=pQB%7&Q=MBshi5v57-6T-f5$_=u5Ag((n+TXa}(
ztB*jXqE>4ZLZUdfIn>~Traq=9<5k+)+ZNhVE|izDOksX@+D(+0-Q<(|&F`Gw_k7RE
zIkNQJH`pJNM~8<Nj|>c49T^&uMn^{^CQOuGpEWD*<yR+FPk!Sq`}6b1>4CmpS#`E1
zD3vGi9xkENun))X0)Efk%K7bIqx!vs=e%IhA5!Hoy`4&e>!b<QRK|m!su((ZnxOF@
zc42a3OBQvx+qieyjLUkBF2#=M(Fzi!zTR#*OrW_TS=nFAV1<d{^VK~3<qRF=rP%dF
zxDWn-cYhJKf;?_T66Mf--Gb;#kU~8{IgHm*hw^;^p<{;_tTGccAHkt7Mm<tGK2d%)
zb!jW8Shp5WTN9Bj^{N5cb-9+d>?}HU-_doT2&Z0$t7zA_L_Nn0IKR#3=4a_tEl=X&
zVdK9BJ>7oUb<^@@{hCZ#HfpiuWYM@|8_Leyu|xwE$LT8h5nJ9?EE#E>Srm`{<CREi
z&^JdA?Q^uo{k-`rYLk~>O<j&<!&+Lh){iCf@7u$DVc4+#OD=twM5QJg-FwMMk4y4-
ztj|UbcoJ;lgw2_sb0SW|)zvEn>0^mnHgDvP_6x3jl0wbG1sG#us4Xu?dSuuE+dt(m
zla64(ld7~fdR&G=x;CxCl#)ViQeq@gz2KrqR}&x0(YdoJUY3lrsUb=V_!Rl!xucMq
z!6U;r3|E!#Bxe<U*57EcTuwD-W^!C4s*H`|)ckprMbAgKWEt0MstNeqGb4xS>u|~a
zSE^x4Dy&<Idbb`?dq*(U+1#+}Lb;K>AEdA+F^ONx4A>iQzZC8fyd5#<@HjGt5AB4s
z82)~LE`!G1h?-R}TQEluFPI{T6+{W1U1_gk%lNZ!6D*#=gS|QQ84KywOec7%6pzv_
z|Hqo}LSg;%|5QtXJJ)y;HHnaB8h)YO_uE$cKZ?UTV`5mpCV1fijjOrse`xzxXz-^k
yLa{fcyBy80xZ4}GN^w3yzblyhe@|G9$^QUvw_=Bq+&dfq0000<MNUMnLSTa9Rk*bP

literal 0
HcmV?d00001

diff --git a/ILSpy/Images/StepInto.png b/Debugger/ILSpy.Debugger/Images/StepInto.png
similarity index 100%
rename from ILSpy/Images/StepInto.png
rename to Debugger/ILSpy.Debugger/Images/StepInto.png
diff --git a/ILSpy/Images/StepOut.png b/Debugger/ILSpy.Debugger/Images/StepOut.png
similarity index 100%
rename from ILSpy/Images/StepOut.png
rename to Debugger/ILSpy.Debugger/Images/StepOut.png
diff --git a/ILSpy/Images/StepOver.png b/Debugger/ILSpy.Debugger/Images/StepOver.png
similarity index 100%
rename from ILSpy/Images/StepOver.png
rename to Debugger/ILSpy.Debugger/Images/StepOver.png
diff --git a/ILSpy/Images/bug.png b/Debugger/ILSpy.Debugger/Images/bug.png
similarity index 100%
rename from ILSpy/Images/bug.png
rename to Debugger/ILSpy.Debugger/Images/bug.png
diff --git a/ICSharpCode.Decompiler/Ast/AstBuilder.cs b/ICSharpCode.Decompiler/Ast/AstBuilder.cs
index f53e544f2..7af14f7e8 100644
--- a/ICSharpCode.Decompiler/Ast/AstBuilder.cs
+++ b/ICSharpCode.Decompiler/Ast/AstBuilder.cs
@@ -471,7 +471,8 @@ namespace Decompiler
 			
 			MethodDeclaration astMethod = new MethodDeclaration();
 			astMethod.AddAnnotation(methodDef);
-			astMethod.AddAnnotation(methodMapping);
+			if (methodMapping != null)
+				astMethod.AddAnnotation(methodMapping);
 			astMethod.ReturnType = ConvertType(methodDef.ReturnType, methodDef.MethodReturnType);
 			astMethod.Name = CleanName(methodDef.Name);
 			astMethod.TypeParameters.AddRange(MakeTypeParameters(methodDef.GenericParameters));
diff --git a/ILSpy.sln b/ILSpy.sln
index 3bb9f43f4..d74569dab 100644
--- a/ILSpy.sln
+++ b/ILSpy.sln
@@ -1,15 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.1.0.7302-alpha
+# SharpDevelop 4.1.0.7312-alpha
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{1DEB3B4E-03AC-437C-821D-B09FBFCC3E5B}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.Debugger", "Debugger\ILSpy.Debugger\ILSpy.Debugger.csproj", "{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy", "ILSpy\ILSpy.csproj", "{1E85EFF9-E370-4683-83E4-8A3D063FF791}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
@@ -106,7 +106,7 @@ Global
 		{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A}.Release|Any CPU.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A} = {1DEB3B4E-03AC-437C-821D-B09FBFCC3E5B}
 		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {1DEB3B4E-03AC-437C-821D-B09FBFCC3E5B}
+		{6D3D0F0D-348D-456A-A6ED-E9BD5EFABB6A} = {1DEB3B4E-03AC-437C-821D-B09FBFCC3E5B}
 	EndGlobalSection
 EndGlobal
diff --git a/ILSpy/Commands/RoutedUICommands.cs b/ILSpy/Commands/RoutedUICommands.cs
index 923fb2660..2c599cc60 100644
--- a/ILSpy/Commands/RoutedUICommands.cs
+++ b/ILSpy/Commands/RoutedUICommands.cs
@@ -31,6 +31,8 @@ namespace ICSharpCode.ILSpy.Commands
 			StepInto = new RoutedUICommand("Step into", "StepInto", typeof(RoutedUICommands));
 			StepOver = new RoutedUICommand("Step over", "StepOver", typeof(RoutedUICommands));
 			StepOut = new RoutedUICommand("Step out", "StepOut", typeof(RoutedUICommands));
+			
+			RemoveAllBreakpoint = new RoutedUICommand("Remove all breakpoints", "RemoveAllBreakpoint", typeof(RoutedUICommands));
 		}
 		
 		public static RoutedUICommand AttachToProcess { get; private set; }
@@ -44,5 +46,7 @@ namespace ICSharpCode.ILSpy.Commands
 		public static RoutedUICommand StepOver { get; private set; }
 		
 		public static RoutedUICommand StepOut { get; private set; }
+		
+		public static RoutedUICommand RemoveAllBreakpoint { get; private set; }
 	}
 }
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 8c17c8e02..f1a1a347d 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -122,12 +122,7 @@
     <Resource Include="Images\Delete.png" />
     <Resource Include="Images\ILSpy.ico" />
     <Resource Include="Images\FindAssembly.png" />
-    <Resource Include="Images\bug.png" />
     <None Include="app.config" />
-    <Resource Include="Images\ContinueDebugging.png" />
-    <Resource Include="Images\StepInto.png" />
-    <Resource Include="Images\StepOut.png" />
-    <Resource Include="Images\StepOver.png" />
     <None Include="Properties\AssemblyInfo.template.cs" />
     <Compile Include="Properties\WPFAssemblyInfo.cs" />
     <Compile Include="MainWindow.xaml.cs">
diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml
index 32f382db4..303fd36b4 100644
--- a/ILSpy/MainWindow.xaml
+++ b/ILSpy/MainWindow.xaml
@@ -21,6 +21,9 @@
 		</ResourceDictionary>
 	</Window.Resources>
 	<Window.CommandBindings>
+		<CommandBinding
+			Command="routedCommands:RoutedUICommands.RemoveAllBreakpoint"
+			Executed="RemoveAllBreakpointExecuted" />
 		<CommandBinding
 			Command="routedCommands:RoutedUICommands.AttachToProcess"
 			Executed="AttachToProcessExecuted" />
@@ -88,32 +91,39 @@
 			<MenuItem Header="_Debugger">
 				<MenuItem x:Name="AttachMenuItem" Header="Attach to _running application" Command="routedCommands:RoutedUICommands.AttachToProcess">
 					<MenuItem.Icon>
-						<Image Width="16" Height="16" Source="Images/bug.png" />
+						<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/bug.png" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem x:Name="ContinueDebuggingMenuItem" IsEnabled="False" Header="Continue debugging" InputGestureText="F5" Command="routedCommands:RoutedUICommands.ContinueDebugging">
 					<MenuItem.Icon>
-						<Image Width="16" Height="16" Source="Images/ContinueDebugging.png" />
+						<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/ContinueDebugging.png" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem x:Name="StepIntoMenuItem" IsEnabled="False" Header="Step into" InputGestureText="F11" Command="routedCommands:RoutedUICommands.StepInto">
 					<MenuItem.Icon>
-						<Image Width="16" Height="16" Source="Images/StepInto.png" />
+						<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/StepInto.png" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem x:Name="StepOverMenuItem" IsEnabled="False" Header="Step over" InputGestureText="F10" Command="routedCommands:RoutedUICommands.StepOver">
 					<MenuItem.Icon>
-						<Image Width="16" Height="16" Source="Images/StepOver.png" />
+						<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/StepOver.png" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem x:Name="StepOutMenuItem" IsEnabled="False" Header="Step out" Command="routedCommands:RoutedUICommands.StepOut">
 					<MenuItem.Icon>
-						<Image Width="16" Height="16" Source="Images/StepOut.png" />
+						<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/StepOut.png" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem x:Name="DetachMenuItem" IsEnabled="False"
 				          Header="Detach from running application" 
 				          Command="routedCommands:RoutedUICommands.DetachFromProcess"/>
+				<Separator/>
+				<MenuItem x:Name="RemoveAllBreakpointsItem" Header="Remove all breakpoints" Command="routedCommands:RoutedUICommands.RemoveAllBreakpoint">
+					<MenuItem.Icon>
+						<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/DeleteAllBreakpoints.png" />
+					</MenuItem.Icon>
+				</MenuItem>
+				
 			</MenuItem>
 			<MenuItem Header="_Help">
 				<MenuItem Header="_About" Click="AboutClick" />
@@ -160,7 +170,7 @@
 			/>
 			<Separator />
 			<Button x:Name="AttachButton" Command="routedCommands:RoutedUICommands.AttachToProcess" ToolTip="Attach to running process...">
-				<Image Width="16" Height="16" Source="Images/bug.png" />
+				<Image Width="16" Height="16" Source="pack://application:,,,/ILSpy.Debugger;component/Images/bug.png" />
 			</Button>
 		</ToolBar>
 		<!-- Main grid separating left pane (treeView) from main pane (textEditor) -->
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index bb4a41ebe..b95b636a2 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -32,6 +32,7 @@ using ICSharpCode.Decompiler;
 using ICSharpCode.ILSpy.TreeNodes;
 using ICSharpCode.TreeView;
 using ILSpy.Debugger.AvalonEdit;
+using ILSpy.Debugger.Bookmarks;
 using ILSpy.Debugger.Services;
 using ILSpy.Debugger.UI;
 using Microsoft.Win32;
@@ -366,6 +367,16 @@ namespace ICSharpCode.ILSpy
 				DebuggerService.CurrentDebugger.StepOut();
 		}
 		
+		void RemoveAllBreakpointExecuted(object sender, ExecutedRoutedEventArgs e)
+		{
+			for (int i = BookmarkManager.Bookmarks.Count - 1; i >= 0; --i) {
+				var bookmark = BookmarkManager.Bookmarks[i];
+				if (bookmark is BreakpointBookmark) {
+					BookmarkManager.RemoveMark(bookmark);
+				}
+			}
+		}
+		
 		protected override void OnKeyUp(KeyEventArgs e)
 		{
 			switch (e.Key) {