Moving some debugger's files around

src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj

@@ -103,11 +103,11 @@
       <DependentUpon>DebuggingOptionsPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Pads\AutoCompleteTextBox.cs" />
     <Compile Include="Pads\CallStackPad.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Pads\Commands\WatchPadCommands.cs" />
+    <Compile Include="Pads\WatchPadCommands.cs" />
-    <Compile Include="Pads\Common\AutoCompleteTextBox.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Options\DebuggingOptions.cs" />
     <Compile Include="Options\DebuggingSymbolsPanel.cs">
@@ -129,7 +129,7 @@
     <Compile Include="Service\AttachToProcessForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Service\BreakpointCommands.cs" />
+    <Compile Include="Service\DebuggerCommands.cs" />
     <Compile Include="Service\DebuggeeExceptionForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -147,12 +147,10 @@
     <EmbeddedResource Include="Service\DebuggeeExceptionForm.resx">
       <DependentUpon>DebuggeeExceptionForm.cs</DependentUpon>
     </EmbeddedResource>
-    <Compile Include="Service\RunToCursorCommand.cs" />
     <Compile Include="Service\WindowsDebugger.cs" />
     <EmbeddedResource Include="Options\DebuggingSymbolsPanel.resx">
       <DependentUpon>DebuggingSymbolsPanel.cs</DependentUpon>
     </EmbeddedResource>
-    <Compile Include="Service\SetCurrentStatementCommand.cs" />
     <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
@@ -219,7 +217,7 @@
   <ItemGroup>
     <Folder Include="Tooltips" />
     <Page Include="Options\DebuggingOptionsPanel.xaml" />
-    <Page Include="Pads\Common\CommonResources.xaml" />
+    <Page Include="Pads\CommonResources.xaml" />
     <Page Include="Service\EditBreakpointScriptWindow.xaml" />
     <Page Include="Tooltips\DebuggerTooltipControl.xaml" />
     <Page Include="Tooltips\VisualizerPicker.xaml" />
@@ -229,8 +227,6 @@
       <Private>False</Private>
     </ProjectReference>
     <Folder Include="NRefactory" />
-    <Folder Include="Pads\Commands" />
-    <Folder Include="Pads\Common" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerCommands.cs

@@ -8,9 +8,34 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Services;
 
 namespace Debugger.AddIn
 {
+	public class RunToCursorCommand : AbstractMenuCommand
+	{
+		public override void Run()
+		{
+			ITextEditor editor = SD.GetActiveViewContentService<ITextEditor>();
+			if (editor == null || WindowsDebugger.CurrentProcess == null)
+				return;
+			WindowsDebugger.CurrentProcess.RunTo(editor.FileName, editor.Caret.Line, editor.Caret.Column);
+		}
+	}
+	
+	public class SetCurrentStatementCommand : AbstractMenuCommand
+	{
+		public override void Run()
+		{
+			ITextEditor textEditor = SD.GetActiveViewContentService<ITextEditor>();
+				
+			if (textEditor == null || DebuggerService.CurrentDebugger == null)
+				return;
+			
+			DebuggerService.CurrentDebugger.SetInstructionPointer(textEditor.FileName, textEditor.Caret.Line, textEditor.Caret.Column, false);
+		}
+	}
+	
 	public static class BreakpointUtil
 	{
 		public static IEnumerable<BreakpointBookmark> BreakpointsOnCaret {

src/AddIns/Debugger/Debugger.AddIn/Service/RunToCursorCommand.cs

@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
-
-using System.Linq;
-using Debugger;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Debugging;
-using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.Services
-{
-	public class RunToCursorCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			ITextEditor editor = SD.GetActiveViewContentService<ITextEditor>();
-			if (editor == null || WindowsDebugger.CurrentProcess == null)
-				return;
-			WindowsDebugger.CurrentProcess.RunTo(editor.FileName, editor.Caret.Line, editor.Caret.Column);
-		}
-	}
-}

src/AddIns/Debugger/Debugger.AddIn/Service/SetCurrentStatementCommand.cs

@@ -1,23 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
-
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Debugging;
-using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.Services
-{
-	public class SetCurrentStatementCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			ITextEditor textEditor = SD.GetActiveViewContentService<ITextEditor>();
-				
-			if (textEditor == null || DebuggerService.CurrentDebugger == null)
-				return;
-			
-			DebuggerService.CurrentDebugger.SetInstructionPointer(textEditor.FileName, textEditor.Caret.Line, textEditor.Caret.Column, false);
-		}
-	}
-}

src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj

@@ -58,9 +58,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Interop\MTA2STA.cs" />
+    <Compile Include="LocalVariable.cs" />
     <Compile Include="ManagedCallback.cs" />
     <Compile Include="ManagedCallbackProxy.cs" />
     <Compile Include="ManagedCallbackSwitch.cs" />
+    <Compile Include="TestAttributes.cs" />
     <Compile Include="TypeSystemExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="AppDomain.cs" />
@@ -68,7 +70,6 @@
     <Compile Include="DebuggerException.cs" />
     <Compile Include="Eval.cs" />
     <Compile Include="Exception.cs" />
-    <Compile Include="GetValueException.cs" />
     <Compile Include="Interop\Common.cs" />
     <Compile Include="Interop\CorDebug.cs" />
     <Compile Include="Interop\CorDebugExtensionMethods.cs" />
@@ -84,7 +85,6 @@
     <Compile Include="Interop\NativeMethods.cs" />
     <Compile Include="Interop\TrackedComObjects.cs" />
     <Compile Include="Interop\Util.cs" />
-    <Compile Include="MetaData\DebugMethodInfo.cs" />
     <Compile Include="Module.cs" />
     <Compile Include="NDebugger.cs" />
     <Compile Include="Options.cs" />
@@ -92,9 +92,6 @@
     <Compile Include="SourcecodeSegment.cs" />
     <Compile Include="StackFrame.cs" />
     <Compile Include="Stepper.cs" />
-    <Compile Include="Tests\ExpandAttribute.cs" />
-    <Compile Include="Tests\IgnoreAttribute.cs" />
-    <Compile Include="Tests\IgnoreOnExceptionAttribute.cs" />
     <Compile Include="Thread.cs" />
     <Compile Include="Value.cs" />
   </ItemGroup>
@@ -127,8 +124,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interop" />
-    <Folder Include="MetaData" />
-    <Folder Include="Tests" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">

src/AddIns/Debugger/Debugger.Core/GetValueException.cs

@@ -1,22 +0,0 @@
-// 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;
-
-namespace Debugger
-{
-	public class GetValueException: DebuggerException
-	{
-		public GetValueException(string error, System.Exception inner):base(error, inner)
-		{
-		}
-		
-		public GetValueException(string errorFmt, params object[] args):base(string.Format(errorFmt, args))
-		{
-		}
-		
-		public GetValueException(string error):base(error)
-		{
-		}
-	}
-}

src/AddIns/Debugger/Debugger.Core/TestAttributes.cs

@@ -5,6 +5,18 @@ using System;
 
 namespace Debugger.Tests
 {
+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
+	public class ExpandAttribute: Attribute
+	{
+		
+	}
+	
+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
+	public class IgnoreAttribute: Attribute
+	{
+		
+	}
+	
 	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Class)]
 	public class IgnoreOnExceptionAttribute: Attribute
 	{

src/AddIns/Debugger/Debugger.Core/Tests/ExpandAttribute.cs

@@ -1,13 +0,0 @@
-// 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;
-
-namespace Debugger.Tests
-{
-	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
-	public class ExpandAttribute: Attribute
-	{
-		
-	}
-}

src/AddIns/Debugger/Debugger.Core/Tests/IgnoreAttribute.cs

@@ -1,13 +0,0 @@
-// 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;
-
-namespace Debugger.Tests
-{
-	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
-	public class IgnoreAttribute: Attribute
-	{
-		
-	}
-}

src/AddIns/Debugger/Debugger.Core/Value.cs

@@ -14,11 +14,17 @@ namespace Debugger
 {
 	public delegate Value ValueGetter(StackFrame context);
 	
+	public class GetValueException: DebuggerException
+	{
+		public GetValueException(string error) : base(error) {}
+		public GetValueException(string errorFmt, params object[] args) : base(string.Format(errorFmt, args)) {}
+		public GetValueException(string error, System.Exception inner) : base(error, inner) {}
+	}
+	
 	/// <summary>
 	/// Value class provides functions to examine value in the debuggee.
-	/// It has very life-time.  In general, value dies whenever debugger is
+	/// It has very short life-time.  In general, value dies whenever debugger is
 	/// resumed (this includes method invocation and property evaluation).
-	/// You can use Expressions to reobtain the value.
 	/// </summary>
 	public class Value: DebuggerObject
 	{