From 0eb8e20dbc3450bbb2bd3d2a1b4cd4966bf92b5f Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 19 Jan 2013 00:16:33 +0100 Subject: [PATCH] Adjust SharpDevelop to NRefactory update. I removed the Mono.Cecil reference from SD.Base as it was only used in the broken debugger-decompiler code, which doesn't really belong into Base anyways. --- SharpDevelop.Tests.sln | 2 +- SharpDevelop.sln | 2 +- .../Src/Completion/CSharpCompletionDataFactory.cs | 4 ++-- .../Project/Src/Refactoring/SDRefactoringContext.cs | 2 +- .../Debugger/Debugger.AddIn/Debugger.AddIn.csproj | 2 +- .../Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs | 13 +++++++------ .../Debugger.AddIn/Service/WindowsDebugger.cs | 10 +++++----- .../Debugger/Debugger.Core/Debugger.Core.csproj | 2 +- .../AvalonEdit.AddIn/AvalonEdit.AddIn.csproj | 5 ----- .../DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj | 2 +- .../ICSharpCode.Decompiler.csproj | 2 +- .../ICSharpCode.NRefactory.Tests.csproj | 2 +- .../Base/Project/ICSharpCode.SharpDevelop.csproj | 4 ---- .../Project/Src/Editor/Commands/GoToDefinition.cs | 1 - .../Dialogs/ReferenceDialog/GacReferencePanel.cs | 8 -------- .../Src/Services/Debugger/DebuggerService.cs | 3 ++- .../Debugger/DecompiledBreakpointBookmark.cs | 3 ++- src/Main/SharpDevelop/SharpDevelop.csproj | 2 +- 18 files changed, 27 insertions(+), 42 deletions(-) diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln index 0ab2fb49d6..9a3946c95e 100644 --- a/SharpDevelop.Tests.sln +++ b/SharpDevelop.Tests.sln @@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{ ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}" EndProject diff --git a/SharpDevelop.sln b/SharpDevelop.sln index 725eed1d59..f797361804 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{ ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}" ProjectSection(SolutionItems) = postProject diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs index aaf0fdea89..2673b736d0 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs @@ -149,9 +149,9 @@ namespace CSharpBinding.Completion return CreateMethodDataProvider(startOffset, new[] { type.GetDelegateInvokeMethod() }); } - IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider(int startOffset, IType type, AstNode resolvedNode) + IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider(int startOffset, IType type, IEnumerable accessibleIndexers, AstNode resolvedNode) { - return CreateMethodDataProvider(startOffset, type.GetProperties(p => p.IsIndexer)); + return CreateMethodDataProvider(startOffset, accessibleIndexers); } IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider(int startOffset, IEnumerable types) diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs index d67b82c8e5..1416e1934e 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs @@ -28,7 +28,7 @@ namespace CSharpBinding.Refactoring readonly ITextEditor editor; readonly ITextSource textSource; readonly TextLocation location; - volatile IDocument document; + IDocument document; int selectionStart, selectionLength; public static SDRefactoringContext Create(ITextEditor editor, CancellationToken cancellationToken) diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj index 5073f705f1..bd8b3c7de1 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj +++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj @@ -161,7 +161,7 @@ ICSharpCode.AvalonEdit False - + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil False diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs index cee8fb231e..85e3dfc17a 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs @@ -29,18 +29,19 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads return mark.IsVisibleInBookmarkPad && mark is BreakpointBookmark; } + /* protected override void OnItemActivated(SDBookmark bookmark) { if (bookmark is DecompiledBreakpointBookmark) { -// // get information from breakpoint and navigate to the decompiled type -// string assemblyFile, typeName; -// if (DecompiledBreakpointBookmark.GetAssemblyAndType(bookmark.FileName, out assemblyFile, out typeName)) { -// NavigationService.NavigateTo(assemblyFile, typeName, string.Empty, bookmark.LineNumber, false); -// } + // get information from breakpoint and navigate to the decompiled type + string assemblyFile, typeName; + if (DecompiledBreakpointBookmark.GetAssemblyAndType(bookmark.FileName, out assemblyFile, out typeName)) { + NavigationService.NavigateTo(assemblyFile, typeName, string.Empty, bookmark.LineNumber, false); + } throw new NotImplementedException(); } else { base.OnItemActivated(bookmark); } - } + }*/ } } diff --git a/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs index 1bcecb3697..7b1bf4b84e 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs @@ -409,7 +409,8 @@ namespace ICSharpCode.SharpDevelop.Services { Breakpoint breakpoint = null; - if (bookmark is DecompiledBreakpointBookmark) { + #warning decompiler + /*if (bookmark is DecompiledBreakpointBookmark) { try { if (debuggerDecompilerService == null) { LoggingService.Warn("No IDebuggerDecompilerService found!"); @@ -429,16 +430,15 @@ namespace ICSharpCode.SharpDevelop.Services int[] ilRanges; int methodToken; - #warning decompiler // if (debuggerDecompilerService.GetILAndTokenByLineNumber(token, dbb.LineNumber, out ilRanges, out methodToken)) { // CurrentDebugger.AddILBreakpoint(memberReference.FullName, dbb.LineNumber, memberReference.MetadataToken.ToInt32(), methodToken, ilRanges[0], dbb.IsEnabled); // } } catch (System.Exception ex) { LoggingService.Error("Error on DecompiledBreakpointBookmark: " + ex.Message); } - } else { - breakpoint = CurrentDebugger.AddBreakpoint(bookmark.FileName, bookmark.LineNumber, 0, bookmark.IsEnabled); - } + } else {*/ + breakpoint = CurrentDebugger.AddBreakpoint(bookmark.FileName, bookmark.LineNumber, 0, bookmark.IsEnabled); + //} if (breakpoint == null) { LoggingService.Warn(string.Format("unable to create breakpoint: {0}", bookmark.ToString())); diff --git a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj index 601b470977..7b9128a76a 100644 --- a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj +++ b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj @@ -126,7 +126,7 @@ - + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil False diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj index 47aaa9635e..32a682ce8a 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj @@ -224,11 +224,6 @@ ICSharpCode.AvalonEdit False - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - False - {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} ICSharpCode.NRefactory.Xml diff --git a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj index a6a2d2bc71..230f120d34 100644 --- a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj +++ b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj @@ -94,7 +94,7 @@ {984CC812-9470-4A13-AFF9-CC44068D666C} ICSharpCode.Decompiler - + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil False diff --git a/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 8ec5004283..40fa4dc044 100644 --- a/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -129,7 +129,7 @@ - + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil False diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj index 7eba852b19..22c8ec2a20 100644 --- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj +++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj @@ -66,7 +66,7 @@ - ..\..\Mono.Cecil\Test\libs\nunit-2.5.10\nunit.framework.dll + ..\..\cecil\Test\libs\nunit-2.5.10\nunit.framework.dll diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 0d9d18f26f..6dcd191021 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -865,10 +865,6 @@ ICSharpCode.AvalonEdit False - - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} - Mono.Cecil - {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} ICSharpCode.NRefactory diff --git a/src/Main/Base/Project/Src/Editor/Commands/GoToDefinition.cs b/src/Main/Base/Project/Src/Editor/Commands/GoToDefinition.cs index 2b9ed91c0f..efbb94ed47 100644 --- a/src/Main/Base/Project/Src/Editor/Commands/GoToDefinition.cs +++ b/src/Main/Base/Project/Src/Editor/Commands/GoToDefinition.cs @@ -8,7 +8,6 @@ using ICSharpCode.NRefactory.Semantics; using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Project; -using Mono.Cecil; namespace ICSharpCode.SharpDevelop.Editor.Commands { diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs index bae3208041..95e8ed7d1f 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs @@ -12,7 +12,6 @@ using ICSharpCode.Build.Tasks; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Parser; using ICSharpCode.SharpDevelop.Project; -using Mono.Cecil; namespace ICSharpCode.SharpDevelop.Gui { @@ -55,8 +54,6 @@ namespace ICSharpCode.SharpDevelop.Gui ColumnSorter sorter; BackgroundWorker worker; List resultList = new List(); - Dictionary assembliesCache = new Dictionary(); - DefaultAssemblyResolver resolver = new DefaultAssemblyResolver(); public GacReferencePanel(ISelectReferenceDialog selectDialog) { @@ -151,14 +148,9 @@ namespace ICSharpCode.SharpDevelop.Gui worker = null; // clear all cached data - assembliesCache = null; resultList = null; selectDialog = null; - resolver = null; fullItemList = null; - - // force a collection to reclam memory - GC.Collect(); } base.Dispose(disposing); } diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs index 4404b012a2..a129f159b2 100644 --- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs +++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs @@ -10,7 +10,6 @@ using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.Bookmarks; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Project; -using Mono.Cecil; namespace ICSharpCode.SharpDevelop.Debugging { @@ -239,6 +238,7 @@ namespace ICSharpCode.SharpDevelop.Debugging [SDService] public interface IDebuggerDecompilerService { + /* /// /// Gets or sets the current method token and IL offset. Used for step in/out. /// @@ -280,5 +280,6 @@ namespace ICSharpCode.SharpDevelop.Debugging /// Assembly file path. /// An . IAssemblyResolver GetAssemblyResolver(string assemblyFile); + */ } } diff --git a/src/Main/Base/Project/Src/Services/Debugger/DecompiledBreakpointBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/DecompiledBreakpointBookmark.cs index 1cb3019ed1..844a1ce21a 100644 --- a/src/Main/Base/Project/Src/Services/Debugger/DecompiledBreakpointBookmark.cs +++ b/src/Main/Base/Project/Src/Services/Debugger/DecompiledBreakpointBookmark.cs @@ -4,10 +4,10 @@ using System; using ICSharpCode.Core; using ICSharpCode.NRefactory; using ICSharpCode.SharpDevelop.Debugging; -using Mono.Cecil; namespace ICSharpCode.SharpDevelop.Editor.Bookmarks { + /* public class DecompiledBreakpointBookmark : BreakpointBookmark { public const string SEPARATOR = ","; // don't use '.' @@ -69,4 +69,5 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks return true; } } + */ } diff --git a/src/Main/SharpDevelop/SharpDevelop.csproj b/src/Main/SharpDevelop/SharpDevelop.csproj index fa7240e6c4..a8e5441863 100644 --- a/src/Main/SharpDevelop/SharpDevelop.csproj +++ b/src/Main/SharpDevelop/SharpDevelop.csproj @@ -183,7 +183,7 @@ {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} ICSharpCode.AvalonEdit - + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} Mono.Cecil