diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs index 27cae11103..d4c6087cc2 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs @@ -5,10 +5,10 @@ // $Revision$ // +using ICSharpCode.NRefactory.Visitors; using System; using System.Collections; using System.Windows.Controls; - using Debugger; using Debugger.AddIn; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs index 8b2a48d250..3726edfe7e 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs @@ -15,6 +15,8 @@ using Debugger.AddIn.TreeModel; using ICSharpCode.Core; using ICSharpCode.Core.WinForms; using ICSharpCode.NRefactory; +using ICSharpCode.NRefactory.Ast; +using ICSharpCode.NRefactory.Visitors; using Exception = System.Exception; namespace ICSharpCode.SharpDevelop.Gui.Pads diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs index 85782ae43d..7e7771a219 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs @@ -37,7 +37,7 @@ // #endregion -using ICSharpCode.NRefactory.Ast; +using ICSharpCode.NRefactory.Visitors; using System; using System.Diagnostics; using System.Drawing; @@ -52,6 +52,7 @@ using Debugger.Core.Wrappers.CorPub; using ICSharpCode.Core; using ICSharpCode.Core.WinForms; using ICSharpCode.NRefactory; +using ICSharpCode.NRefactory.Ast; using ICSharpCode.SharpDevelop.Bookmarks; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ExpandedExpressions.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ExpandedExpressions.cs index 5df38f274b..a1287cb8ec 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ExpandedExpressions.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ExpandedExpressions.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; using Debugger.AddIn.Visualizers.Graph.Layout; -using Expression = ICSharpCode.NRefactory.Ast.Expression; +using ICSharpCode.NRefactory.Ast; namespace Debugger.AddIn.Visualizers.Graph diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/ContentNode.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/ContentNode.cs index 3df31de6cf..3469821889 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/ContentNode.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/ContentNode.cs @@ -5,6 +5,7 @@ // $Revision$ // using ICSharpCode.Core; +using ICSharpCode.NRefactory.Ast; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs index e214c0d628..0ba02926fc 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs @@ -4,16 +4,17 @@ // // $Revision$ // -using ICSharpCode.NRefactory; using System; using System.Collections.Generic; -using Debugger; +using System.Reflection; + using Debugger.AddIn.Visualizers.Common; using Debugger.AddIn.Visualizers.Utils; using Debugger.MetaData; +using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; +using ICSharpCode.NRefactory.Visitors; using ICSharpCode.SharpDevelop.Services; -using System.Reflection; namespace Debugger.AddIn.Visualizers.Graph { diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs index a1286937b8..90612726fb 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs @@ -11,6 +11,7 @@ using System.Text; using Debugger.AddIn.Visualizers.Utils; using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.NRefactory.Ast; namespace Debugger.AddIn.Visualizers.Graph { diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraphControl.xaml.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraphControl.xaml.cs index 152a8270d6..1ac4b81073 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraphControl.xaml.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraphControl.xaml.cs @@ -19,6 +19,7 @@ using System.Windows.Media; using Debugger.AddIn.Visualizers.Graph.Layout; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.NRefactory.Ast; namespace Debugger.AddIn.Visualizers.Graph { diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs index 0efd1c0fad..9407a0272a 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs @@ -24,6 +24,7 @@ using Debugger.MetaData; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.NRefactory.Ast; namespace Debugger.AddIn.Visualizers.GridVisualizer { diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/AtomicType.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/AtomicType.cs index bc0f95ee5a..8cd2c46ad9 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/AtomicType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/AtomicType.cs @@ -7,7 +7,7 @@ using Debugger.MetaData; using System; using ICSharpCode.SharpDevelop.Services; -using Expression = ICSharpCode.NRefactory.Ast.Expression; +using ICSharpCode.NRefactory.Ast; namespace Debugger.AddIn.Visualizers.Utils { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj index 883ef50fef..3f383fc400 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj @@ -70,8 +70,6 @@ - - @@ -256,6 +254,8 @@ + + @@ -451,7 +451,6 @@ - @@ -464,6 +463,9 @@ + + + diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs index 0971efefc5..2c65a9a816 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/MTA2STA.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/MTA2STA.cs index 0a99774192..a685130b9d 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/MTA2STA.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/MTA2STA.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Windows.Forms; -namespace Debugger.Interop +namespace Debugger.Internal { public delegate T MethodInvokerWithReturnValue(); diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs index 6794cbf16d..77f84dd8a2 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.InteropServices; using Debugger.Wrappers.CorDebug; -namespace Debugger +namespace Debugger.Internal { /// /// Handles all callbacks of a given process diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackProxy.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackProxy.cs index 17691685b0..8db929c80a 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackProxy.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackProxy.cs @@ -19,7 +19,7 @@ using Debugger.Wrappers.CorDebug; // \1\2\n\1{\n\1\tCallbackReceived("\3", new object[] {\4, \5, \6, \7, \8, \9});\n\1} // \1\2\n\1{\n\1\tCall(delegate {\n\1\t \trealCallback.\3(\n\1\t \t\tMTA2STA.MarshalIntPtrTo(\4),\n\1\t \t\tMTA2STA.MarshalIntPtrTo(\5),\n\1\t \t\tMTA2STA.MarshalIntPtrTo(\6),\n\1\t \t\tMTA2STA.MarshalIntPtrTo(\7),\n\1\t \t\tMTA2STA.MarshalIntPtrTo(\8),\n\1\t \t\tMTA2STA.MarshalIntPtrTo(\9),\n\1\t \t);\n\1\t });\n\1} -namespace Debugger +namespace Debugger.Internal { /// /// This proxy marshals the callback to the appropriate thread diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackSwitch.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackSwitch.cs index 39898ace60..f1bde4ec03 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackSwitch.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallbackSwitch.cs @@ -16,7 +16,7 @@ using System; using System.Runtime.InteropServices; using Debugger.Wrappers.CorDebug; -namespace Debugger +namespace Debugger.Internal { /// /// This class forwards the callback the the approprite process diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs index 34e7ee8aec..38eb93bf19 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs @@ -5,14 +5,13 @@ // $Revision$ // +using Debugger.Internal; using System; using System.Text; using System.Threading; - -using Microsoft.Win32; - using Debugger.Interop; using Debugger.Wrappers.CorDebug; +using Microsoft.Win32; namespace Debugger { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/ExpressionExtensionMethods.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs similarity index 98% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/ExpressionExtensionMethods.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs index 83adc07fb6..313b7d62fc 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/ExpressionExtensionMethods.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs @@ -4,14 +4,16 @@ // // $Revision$ // +using ICSharpCode.NRefactory.Visitors; using System; using System.Collections.Generic; +using System.Reflection; +using Debugger; using Debugger.MetaData; using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.PrettyPrinter; -using System.Reflection; -namespace Debugger +namespace ICSharpCode.NRefactory.Ast { public static class ExpressionExtensionMethods { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/ExpressionEvaluator.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs similarity index 99% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/ExpressionEvaluator.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs index 5b89f440ec..34ba9fa0d9 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/ExpressionEvaluator.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs @@ -4,20 +4,19 @@ // // $Revision$ // +using Debugger; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Reflection; using System.Text; - using Debugger.MetaData; using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.PrettyPrinter; using ICSharpCode.NRefactory.Visitors; -namespace Debugger +namespace ICSharpCode.NRefactory.Visitors { public class ExpressionEvaluator: NotImplementedAstVisitor { @@ -140,7 +139,7 @@ namespace Debugger } } - Stopwatch watch = new Stopwatch(); + System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start(); try { val = (Value)expression.AcceptVisitor(this, null); diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs index 8966d4bc8e..8c34de2a6d 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs @@ -5,10 +5,11 @@ // $Revision$ // -using ICSharpCode.NRefactory.Ast; +using Debugger.Internal; using System; using System.Collections.Generic; using Debugger.Wrappers.CorDebug; +using ICSharpCode.NRefactory.Ast; namespace Debugger { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/ResourceManager.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/ResourceManager.cs index 3cb36faf7a..6758e316e1 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/ResourceManager.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/ResourceManager.cs @@ -7,10 +7,10 @@ #pragma warning disable 1591 +using Debugger.Internal; using System; using System.Collections.Generic; using System.Runtime.InteropServices; - using Debugger.Interop; namespace Debugger.Wrappers