Matching directory names and namespaces

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5124 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs

@@ -5,10 +5,10 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.NRefactory.Visitors;
 using System;
 using System.Collections;
 using System.Windows.Controls;
-
 using Debugger;
 using Debugger.AddIn;
 using ICSharpCode.Core;

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

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;

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

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/ContentNode.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 using ICSharpCode.Core;
+using ICSharpCode.NRefactory.Ast;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs

@@ -4,16 +4,17 @@
 //     <owner name="Martin Koníèek" email="martin.konicek@gmail.com"/>
 //     <version>$Revision$</version>
 // </file>
-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
 {

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
 {

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
 {

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
 {

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
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj

@@ -70,8 +70,6 @@
     <Compile Include="Src\EvalCollection.cs" />
     <Compile Include="Src\Exception.cs" />
     <Compile Include="Src\ExceptionType.cs" />
-    <Compile Include="Src\Expressions\ExpressionEvaluator.cs" />
-    <Compile Include="Src\Expressions\ExpressionExtensionMethods.cs" />
     <Compile Include="Src\GetValueException.cs" />
     <Compile Include="Src\Internal\ManagedCallback.cs" />
     <Compile Include="Src\Internal\ManagedCallbackProxy.cs" />
@@ -256,6 +254,8 @@
     <Compile Include="Src\Mono.Cecil\Mono.Cecil\MethodCallingConvention.cs" />
     <Compile Include="Src\Mono.Cecil\Mono.Cecil\ReflectionException.cs" />
     <Compile Include="Src\NDebugger.cs" />
+    <Compile Include="Src\NRefactory\Ast\ExpressionExtensionMethods.cs" />
+    <Compile Include="Src\NRefactory\Visitors\ExpressionEvaluator.cs" />
     <Compile Include="Src\Options.cs" />
     <Compile Include="Src\PausedReason.cs" />
     <Compile Include="Src\PauseSession.cs" />
@@ -451,7 +451,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Src\Expressions" />
     <Folder Include="Src\Internal" />
     <Folder Include="Src\Interop" />
     <Folder Include="Src\Interop\CorDebug" />
@@ -464,6 +463,9 @@
     <Folder Include="Src\Mono.Cecil\Mono.Cecil.Binary" />
     <Folder Include="Src\Mono.Cecil\Mono.Cecil.Metadata" />
     <Folder Include="Src\Mono.Cecil\Mono.Cecil.Signatures" />
+    <Folder Include="Src\NRefactory" />
+    <Folder Include="Src\NRefactory\Ast" />
+    <Folder Include="Src\NRefactory\Visitors" />
     <Folder Include="Src\Tests" />
     <Folder Include="Src\Util" />
     <Folder Include="Src\Wrappers" />

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.Ast;
 using System;
 using System.Collections.Generic;

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<T>();
 	

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
 {
 	/// <summary>
 	/// Handles all callbacks of a given process

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
 {
 	/// <summary>
 	/// This proxy marshals the callback to the appropriate thread

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
 {
 	/// <summary>
 	/// This class forwards the callback the the approprite process

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs

@@ -5,14 +5,13 @@
 //     <version>$Revision$</version>
 // </file>
 
+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
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Ast/ExpressionExtensionMethods.cs

@@ -4,14 +4,16 @@
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
 //     <version>$Revision$</version>
 // </file>
+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
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NRefactory/Visitors/ExpressionEvaluator.cs

@@ -4,20 +4,19 @@
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
 //     <version>$Revision$</version>
 // </file>
+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);

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs

@@ -5,10 +5,11 @@
 //     <version>$Revision$</version>
 // </file>
 
-using ICSharpCode.NRefactory.Ast;
+using Debugger.Internal;
 using System;
 using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
+using ICSharpCode.NRefactory.Ast;
 
 namespace Debugger
 {

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