Merge branch 'master' of git://github.com/icsharpcode/ILSpy into Debu…

…gger
icsharpcode · Feb 14, 2011 · 37d468c · 37d468c
2 parents 00d01f2 + 9fb7d24
commit 37d468c
Show file tree

Hide file tree

Showing 196 changed files with 3,333 additions and 70,647 deletions.
diff --git a/Debugger/ILSpy.Debugger/AvalonEdit/Editor/IDocument.cs b/Debugger/ILSpy.Debugger/AvalonEdit/Editor/IDocument.cs
@@ -17,7 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.AvalonEdit.Editor
 {

diff --git a/Debugger/ILSpy.Debugger/AvalonEdit/Editor/ITextAnchor.cs b/Debugger/ILSpy.Debugger/AvalonEdit/Editor/ITextAnchor.cs
@@ -16,8 +16,8 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using ICSharpCode.NRefactory;
 using System;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.AvalonEdit.Editor
 {

diff --git a/Debugger/ILSpy.Debugger/Bookmarks/BookmarkBase.cs b/Debugger/ILSpy.Debugger/Bookmarks/BookmarkBase.cs
@@ -20,9 +20,8 @@
 using System.Windows.Input;
 using System.Windows.Media;
 
-using ICSharpCode.NRefactory;
-using ILSpy.Debugger.AvalonEdit;
 using ILSpy.Debugger.AvalonEdit.Editor;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.Bookmarks
 {
@@ -56,7 +55,7 @@ public IDocument Document {
 		void CreateAnchor()
 		{
 			if (document != null) {
-				int lineNumber = Math.Max(1, Math.Min(location.Line, document.TotalNumberOfLines));
+				int lineNumber = Math.Max(1, Math.Min(location.Row, document.TotalNumberOfLines));
 				int lineLength = document.GetLine(lineNumber).Length;
 				int offset = document.PositionToOffset(
 					lineNumber,
@@ -74,7 +73,7 @@ void CreateAnchor()
 		void AnchorDeleted(object sender, EventArgs e)
 		{
 			// the anchor just became invalid, so don't try to use it again
-			location = Location.Empty;
+			location = Location.Null;
 			anchor = null;
 			RemoveMark();
 		}
@@ -126,7 +125,7 @@ public int LineNumber {
 				if (anchor != null)
 					return anchor.Line;
 				else
-					return location.Line;
+					return location.Row;
 			}
 		}
 

diff --git a/Debugger/ILSpy.Debugger/Bookmarks/BookmarkManager.cs b/Debugger/ILSpy.Debugger/Bookmarks/BookmarkManager.cs
@@ -18,7 +18,7 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.Bookmarks
 {

diff --git a/Debugger/ILSpy.Debugger/Bookmarks/BreakpointBookmark.cs b/Debugger/ILSpy.Debugger/Bookmarks/BreakpointBookmark.cs
@@ -17,11 +17,9 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Windows.Input;
 using System.Windows.Media;
-
-using ICSharpCode.NRefactory;
 using ILSpy.Debugger.Services;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.Bookmarks
 {

diff --git a/Debugger/ILSpy.Debugger/Bookmarks/CurrentLineBookmark.cs b/Debugger/ILSpy.Debugger/Bookmarks/CurrentLineBookmark.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Windows.Media;
-using ICSharpCode.NRefactory;
 using ILSpy.Debugger.Services;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.Bookmarks
 {

diff --git a/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj b/Debugger/ILSpy.Debugger/ILSpy.Debugger.csproj
@@ -48,7 +48,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AvalonEdit\Editor\AvalonEditDocumentAdapter.cs" />
     <Compile Include="AvalonEdit\Editor\AvalonEditTextSourceAdapter.cs" />
     <Compile Include="AvalonEdit\Editor\IDocument.cs" />
     <Compile Include="AvalonEdit\Editor\IDocumentLine.cs" />
@@ -104,10 +103,6 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Decompiler\lib\NRefactory\Project\NRefactory.csproj">
-      <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
-      <Name>NRefactory</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj">
       <Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
       <Name>ICSharpCode.Decompiler</Name>
@@ -116,6 +111,10 @@
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Debugger.Core\Debugger.Core.csproj">
       <Project>{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}</Project>
       <Name>Debugger.Core</Name>

diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ArrayRangeNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ArrayRangeNode.cs
@@ -6,6 +6,7 @@
 
 using Debugger;
 using ICSharpCode.NRefactory.Ast;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace ILSpy.Debugger.Models.TreeModel
 {

diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs
@@ -7,6 +7,7 @@
 using Debugger;
 using Debugger.MetaData;
 using ICSharpCode.NRefactory.Ast;
+using ICSharpCode.NRefactory.CSharp;
 using ILSpy.Debugger.Services;
 using ILSpy.Debugger.Services.Debugger;
 

diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ExpressionNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ExpressionNode.cs
@@ -6,15 +6,13 @@
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Windows.Media;
 
 using Debugger;
-using Debugger.Interop.CorDebug;
 using Debugger.MetaData;
 using ICSharpCode.NRefactory.Ast;
+using ICSharpCode.NRefactory.CSharp;
 using ILSpy.Debugger.Services;
-using ILSpy.Debugger.Services.Debugger;
 
 namespace ILSpy.Debugger.Models.TreeModel
 {

diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/IEnumerableNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/IEnumerableNode.cs
@@ -2,7 +2,7 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using Debugger.MetaData;
-using ICSharpCode.NRefactory.Ast;
+using ICSharpCode.NRefactory.CSharp;
 using ILSpy.Debugger.Services.Debugger;
 
 namespace ILSpy.Debugger.Models.TreeModel

diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/IListNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/IListNode.cs
@@ -1,6 +1,6 @@
 // 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 ICSharpCode.NRefactory.Ast;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace ILSpy.Debugger.Models.TreeModel
 {

diff --git a/Debugger/ILSpy.Debugger/Services/Debugger/DebuggerHelper.cs b/Debugger/ILSpy.Debugger/Services/Debugger/DebuggerHelper.cs
@@ -1,12 +1,14 @@
 // 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 Debugger.Interop.CorDebug;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+
 using Debugger;
+using Debugger.Interop.CorDebug;
 using Debugger.MetaData;
 using ICSharpCode.NRefactory.Ast;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace ILSpy.Debugger.Services.Debugger
 {

diff --git a/Debugger/ILSpy.Debugger/Services/Debugger/IDebugger.cs b/Debugger/ILSpy.Debugger/Services/Debugger/IDebugger.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using ICSharpCode.NRefactory;
+using Mono.CSharp;
 
 namespace ILSpy.Debugger.Services
 {

diff --git a/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs b/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs
@@ -10,13 +10,11 @@
 using Debugger;
 using Debugger.Interop.CorPublish;
 using ICSharpCode.Decompiler.Disassembler;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.Ast;
 using ICSharpCode.NRefactory.Visitors;
 using ILSpy.Debugger.Bookmarks;
 using ILSpy.Debugger.Models.TreeModel;
 using ILSpy.Debugger.Services.Debugger;
-using Mono.Cecil.Cil;
+using Mono.CSharp;
 using CorDbg = Debugger;
 using Process = Debugger.Process;
 
@@ -337,7 +335,7 @@ public Value GetValueFromName(string variableName)
 		/// Gets Expression for given variable. Can throw GetValueException.
 		/// <exception cref="GetValueException">Thrown when getting expression fails. Exception message explains reason.</exception>
 		/// </summary>
-		public ICSharpCode.NRefactory.Ast.Expression GetExpression(string variableName)
+		public ICSharpCode.NRefactory.CSharp.Expression GetExpression(string variableName)
 		{
 			if (!CanEvaluate) {
 				throw new GetValueException("Cannot evaluate now - debugged process is either null or running or has no selected stack frame");