diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomain.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomain.cs index 57175d6fa9..0de63d4eef 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomain.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomain.cs @@ -5,8 +5,8 @@ // $Revision$ // -using Debugger.MetaData; using System; +using Debugger.MetaData; using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomainCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomainCollection.cs index e658a774c4..43dd73d2ce 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomainCollection.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomainCollection.cs @@ -6,8 +6,6 @@ // using System; -using System.Collections.Generic; - using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/CollectionWithEvents.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/CollectionWithEvents.cs index b443ae2986..17f1c8a29c 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/CollectionWithEvents.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/CollectionWithEvents.cs @@ -8,7 +8,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; namespace Debugger { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggeeState.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggeeState.cs index f3702f2b53..4451b1871b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggeeState.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggeeState.cs @@ -5,7 +5,6 @@ // $Revision$ // - namespace Debugger { /// diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerException.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerException.cs index 6574bab677..1a7d936e6e 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerException.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerException.cs @@ -5,7 +5,6 @@ // $Revision$ // - namespace Debugger { /// diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Eval.cs index e73a98f700..baabef7a28 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Eval.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Eval.cs @@ -8,9 +8,9 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; + using Debugger.MetaData; using Debugger.Wrappers.CorDebug; -using ICSharpCode.NRefactory.Ast; namespace Debugger { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EvalCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EvalCollection.cs index 1bc36b8b6e..cc502e67c7 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EvalCollection.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EvalCollection.cs @@ -5,8 +5,6 @@ // $Revision$ // -using System.Collections.Generic; - using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ExceptionType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ExceptionType.cs index 24ec5ab52f..f9fafb20f0 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ExceptionType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ExceptionType.cs @@ -5,7 +5,6 @@ // $Revision$ // - namespace Debugger { public enum ExceptionType 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 2c65a9a816..a23537faaf 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs @@ -5,12 +5,8 @@ // $Revision$ // -using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.Ast; using System; -using System.Collections.Generic; -using Debugger.MetaData; -using Debugger.Wrappers.CorDebug; +using ICSharpCode.NRefactory.Ast; namespace Debugger { 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 77f84dd8a2..1610f6e0a9 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 @@ -12,7 +12,6 @@ // Replace with: // \1\2\n\1{\n\1\tEnterCallback(PausedReason.Other, "\3");\n\1\t\n\1\tExitCallback_Continue();\n\1} -using ICSharpCode.NRefactory.Ast; using System; using System.Runtime.InteropServices; using Debugger.Wrappers.CorDebug; 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 8db929c80a..01745fbe0d 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 @@ -7,8 +7,6 @@ using System; using System.Windows.Forms; - -using Debugger.Interop; using Debugger.Wrappers.CorDebug; // Regular expresion: diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugFieldInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugFieldInfo.cs index 30430fcec6..6f2f4bf946 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugFieldInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugFieldInfo.cs @@ -6,11 +6,9 @@ // using System; -using System.Collections.Generic; using System.Globalization; using System.Reflection; -using Debugger.Wrappers.CorDebug; using Debugger.Wrappers.MetaData; using Mono.Cecil.Signatures; diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugLocalVariableInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugLocalVariableInfo.cs index dd2ab1a295..439e1aaf38 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugLocalVariableInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugLocalVariableInfo.cs @@ -6,16 +6,6 @@ // using System; -using System.Collections.Generic; -using System.Globalization; -using System.Reflection; -using System.Runtime.InteropServices; - -using Debugger.Wrappers.CorDebug; -using Debugger.Wrappers.CorSym; -using Debugger.Wrappers.MetaData; -using ICSharpCode.NRefactory.Ast; -using Mono.Cecil.Signatures; namespace Debugger.MetaData { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugMethodInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugMethodInfo.cs index 96e7c4879f..c50573f71f 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugMethodInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugMethodInfo.cs @@ -10,13 +10,12 @@ using System.Collections.Generic; using System.Globalization; using System.Reflection; using System.Runtime.InteropServices; +using System.Text; using Debugger.Wrappers.CorDebug; using Debugger.Wrappers.CorSym; using Debugger.Wrappers.MetaData; -using ICSharpCode.NRefactory.Ast; using Mono.Cecil.Signatures; -using System.Text; namespace Debugger.MetaData { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugParameterInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugParameterInfo.cs index 2d36054b15..9b527f2706 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugParameterInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugParameterInfo.cs @@ -6,13 +6,7 @@ // using System; -using System.Collections.Generic; -using System.Globalization; using System.Reflection; -using Debugger.Wrappers.CorDebug; -using Debugger.Wrappers.MetaData; -using ICSharpCode.NRefactory.Ast; -using Mono.Cecil.Signatures; namespace Debugger.MetaData { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugPropertyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugPropertyInfo.cs index 7afff199e6..d5ea821bb4 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugPropertyInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugPropertyInfo.cs @@ -10,9 +10,6 @@ using System.Collections.Generic; using System.Globalization; using System.Reflection; -using Debugger.Wrappers.CorDebug; -using Debugger.Wrappers.MetaData; - namespace Debugger.MetaData { public class DebugPropertyInfo : System.Reflection.PropertyInfo, IDebugMemberInfo diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugType.cs index 1e5b4e3a56..853a6bb431 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugType.cs @@ -9,12 +9,12 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Reflection; +using System.Text; using Debugger.Wrappers.CorDebug; using Debugger.Wrappers.MetaData; using ICSharpCode.NRefactory.Ast; using Mono.Cecil.Signatures; -using System.Text; namespace Debugger.MetaData { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ModuleCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ModuleCollection.cs index 8845a748cc..6566679a39 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ModuleCollection.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ModuleCollection.cs @@ -6,8 +6,6 @@ // using System; -using System.Collections.Generic; - using Debugger.Wrappers.CorDebug; namespace Debugger 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 38eb93bf19..4d2e7d8cbb 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs @@ -5,10 +5,11 @@ // $Revision$ // -using Debugger.Internal; using System; using System.Text; using System.Threading; + +using Debugger.Internal; using Debugger.Interop; using Debugger.Wrappers.CorDebug; using Microsoft.Win32; diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs index 313b7d62fc..5f0130c4a5 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs @@ -4,14 +4,15 @@ // // $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 ICSharpCode.NRefactory.Visitors; namespace ICSharpCode.NRefactory.Ast { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs index 34ba9fa0d9..2c0f25b66b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs @@ -4,17 +4,15 @@ // // $Revision$ // -using Debugger; using System; using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text; + +using Debugger; using Debugger.MetaData; -using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; -using ICSharpCode.NRefactory.PrettyPrinter; -using ICSharpCode.NRefactory.Visitors; namespace ICSharpCode.NRefactory.Visitors { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessCollection.cs index 6b576a4111..b1cfc16fac 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessCollection.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessCollection.cs @@ -6,8 +6,6 @@ // using System; -using System.Collections.Generic; - using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessEventArgs.cs index 1d0796eb7f..42768f5095 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessEventArgs.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessEventArgs.cs @@ -7,8 +7,6 @@ using System; -using Debugger.Wrappers.CorDebug; - namespace Debugger { [Serializable] diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/SourcecodeSegment.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/SourcecodeSegment.cs index 46aa96e8ac..c7ae57518b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/SourcecodeSegment.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/SourcecodeSegment.cs @@ -8,10 +8,10 @@ using System; using System.Collections.Generic; using System.IO; +using System.Runtime.InteropServices; using Debugger.Wrappers.CorDebug; using Debugger.Wrappers.CorSym; -using System.Runtime.InteropServices; namespace Debugger { diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/StackFrame.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/StackFrame.cs index 1d784b7dc6..79d7d8de4b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/StackFrame.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/StackFrame.cs @@ -11,11 +11,8 @@ using System.Runtime.InteropServices; using Debugger.MetaData; using Debugger.Wrappers.CorDebug; -using Debugger.Wrappers.CorSym; using Debugger.Wrappers.MetaData; -using ICSharpCode.NRefactory.Ast; - namespace Debugger { /// diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepper.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepper.cs index da69549302..4fc684532b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepper.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepper.cs @@ -6,7 +6,6 @@ // using System; - using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Thread.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Thread.cs index f62fcc3495..5aafbfe1f9 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Thread.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Thread.cs @@ -5,12 +5,12 @@ // $Revision$ // -using ICSharpCode.NRefactory.Ast; using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; using System.Threading; + using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ThreadCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ThreadCollection.cs index e3373442fc..65a1de15c6 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ThreadCollection.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ThreadCollection.cs @@ -6,8 +6,6 @@ // using System; -using System.Collections.Generic; - using Debugger.Wrappers.CorDebug; namespace Debugger diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Value.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Value.cs index 1d81a59c3b..02c88f2aa5 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Value.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Value.cs @@ -7,10 +7,10 @@ using System; using System.Collections.Generic; +using System.Reflection; + using Debugger.MetaData; using Debugger.Wrappers.CorDebug; -using ICSharpCode.NRefactory.Ast; -using System.Reflection; namespace Debugger { diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs index cc0523796f..f9d6f7fbea 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs @@ -5,7 +5,6 @@ // $Revision$ // -using ICSharpCode.NRefactory.Ast; using System; using System.CodeDom.Compiler; using System.Collections; @@ -16,11 +15,10 @@ using System.Reflection; using System.Security.Cryptography; using System.Text; using System.Xml; -using Debugger; -using Debugger.Interop; + +using Debugger.Internal; using Microsoft.CSharp; using NUnit.Framework; -using SRPropertyInfo = System.Reflection.PropertyInfo; namespace Debugger.Tests { diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExpressionEvaluator.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExpressionEvaluator.cs index 41cafc9d2a..3a9d7abdb3 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExpressionEvaluator.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExpressionEvaluator.cs @@ -191,8 +191,8 @@ namespace Debugger.Tests { restultFmted = null; } else { try { - Value result = Debugger.ExpressionEvaluator.Evaluate(expr, SupportedLanguage.CSharp, process.SelectedStackFrame); - restultFmted = Debugger.ExpressionEvaluator.FormatValue(result); + Value result = ICSharpCode.NRefactory.Visitors.ExpressionEvaluator.Evaluate(expr, SupportedLanguage.CSharp, process.SelectedStackFrame); + restultFmted = ICSharpCode.NRefactory.Visitors.ExpressionEvaluator.FormatValue(result); } catch (GetValueException e) { restultFmted = e.Message; }