[Monodevelop-patches-list] r1123 - in trunk/MonoDevelop: build/AddIns src/AddIns/DisplayBindings/SourceEditor/Gui src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/Main/Base/Commands src/Main/Base/Services

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-03-06 00:21:02 -0500 (Sat, 06 Mar 2004)
New Revision: 1123

Modified:
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
   trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs
   trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
Log:
added a scrolled window to the variable pad
added keybindings for the debugger commands
removed some exceptions from the service
cleaned up unmarkupline to work *always*


Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-03-06 04:58:01 UTC (rev 1122)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-03-06 05:21:02 UTC (rev 1123)
@@ -797,11 +797,20 @@
 
 			<MenuItem id = "ToggleRunning"
 				  label = "Pause/Resume"
+			          shortcut = "Control|F8"
 				  class = "MonoDevelop.Commands.ToggleRunning"/>
 
+			<MenuItem id = "DebugSep1" label = "-" />
+
 			<MenuItem id = "DebugStepOver"
 				  label = "Step Over"
+			          shortcut = "F11"
 				  class = "MonoDevelop.Commands.StepOver"/>
+
+			<MenuItem id = "DebugStepInto"
+			          label = "Step Into"
+			          shortcut = "Control|F11"
+			          class = "MonoDevelop.Commands.StepInto"/>
 		
 		</MenuItem>
         

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs	2004-03-06 04:58:01 UTC (rev 1122)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs	2004-03-06 05:21:02 UTC (rev 1123)
@@ -15,7 +15,7 @@
 
 namespace MonoDevelop.SourceEditor.Gui
 {
-	public class DebuggerVariablePad : Gtk.Frame
+	public class DebuggerVariablePad : Gtk.ScrolledWindow
 	{
 		StackFrame current_frame;
 
@@ -25,7 +25,7 @@
 
 		public DebuggerVariablePad (bool is_locals_display)
 		{
-			this.Shadow = ShadowType.None;
+			this.ShadowType = ShadowType.In;
 
 			this.is_locals_display = is_locals_display;
 

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-03-06 04:58:01 UTC (rev 1122)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-03-06 05:21:02 UTC (rev 1123)
@@ -77,11 +77,8 @@
 
 		public void UnMarkupLine (int line)
 		{
-			TextIter begin_line = GetIterAtLine (line);
-			TextIter end_line = begin_line;
-			begin_line.LineOffset = 0;
-			end_line.ForwardToLineEnd ();
-			RemoveTag (markup, begin_line, end_line);
+			ClearMarks (SourceMarkerType.ExecutionMark);
+			RemoveTag (markup, StartIter, EndIter);
 		}
 
 		public void LoadFile (string file, string mime)

Modified: trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs	2004-03-06 04:58:01 UTC (rev 1122)
+++ trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs	2004-03-06 05:21:02 UTC (rev 1123)
@@ -31,6 +31,16 @@
 		}
 	}
 
+	public class StepInto : AbstractMenuCommand
+	{
+		public override void Run ()
+		{
+			DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+
+			dbgr.StepInto ();
+		}
+	}
+
 	public class DebugProject : AbstractMenuCommand
 	{
 

Modified: trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs	2004-03-06 04:58:01 UTC (rev 1122)
+++ trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs	2004-03-06 05:21:02 UTC (rev 1123)
@@ -15,6 +15,11 @@
 
 using Mono.Debugger;
 
+/*
+ * Some places we should be doing some error handling we used to toss
+ * exceptions, now we error out silently, this needs a real solution.
+ */
+
 namespace MonoDevelop.Services
 {
 
@@ -124,7 +129,8 @@
 				}
 				breakpoints [key] = loc.InsertBreakpoint (proc, point);
 				if (breakpoints [key] == null)
-					throw new Exception ("Couldn't insert breakpoint " + key);
+					//throw new Exception ("Couldn't insert breakpoint " + key);
+					return;
 			}
 
 			proc.TargetEvent += new TargetEventHandler (target_event);
@@ -185,7 +191,8 @@
 		public void Pause ()
 		{
 			if (!Debugging)
-				throw new Exception ("Debugger not running.");
+				//throw new Exception ("Debugger not running.");
+				return;
 
 			if (proc.IsStopped)
 				return;
@@ -196,7 +203,8 @@
 		public void Resume ()
 		{
 			if (!Debugging)
-				throw new Exception ("Debugger not running.");
+				//throw new Exception ("Debugger not running.");
+				return;
 
 			if (!proc.IsStopped)
 				return;
@@ -227,10 +235,12 @@
 		public void StepInto ()
 		{
 			if (!Debugging)
-				throw new Exception ("Can't step without running debugger.");
+				//throw new Exception ("Can't step without running debugger.");
+				return;
 
 			if (IsRunning)
-				throw new Exception ("Can't step unless paused.");
+				//throw new Exception ("Can't step unless paused.");
+				return;
 
 			proc.StepLine (false);
 		}
@@ -238,10 +248,12 @@
 		public void StepOver ()
 		{
 			if (!Debugging)
-				throw new Exception ("Can't step without running debugger.");
+				//throw new Exception ("Can't step without running debugger.");
+				return;
 
 			if (IsRunning)
-				throw new Exception ("Can't step unless paused.");
+				//throw new Exception ("Can't step unless paused.");
+				return;
 
 			proc.NextLine (false);
 		}