Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 0eb8e20

Browse files
dgrunwalddgrunwald
committed
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.
1 parent 7884b0e commit 0eb8e20

18 files changed

Lines changed: 27 additions & 42 deletions

File tree

‎SharpDevelop.Tests.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
3030
ProjectSection(SolutionItems) = postProject
3131
EndProjectSection
3232
EndProject
33-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
3434
EndProject
3535
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
3636
EndProject

‎SharpDevelop.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
2626
ProjectSection(SolutionItems) = postProject
2727
EndProjectSection
2828
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
3030
EndProject
3131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
3232
ProjectSection(SolutionItems) = postProject

‎src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ IParameterDataProvider IParameterCompletionDataFactory.CreateDelegateDataProvide
149149
return CreateMethodDataProvider(startOffset, new[] { type.GetDelegateInvokeMethod() });
150150
}
151151

152-
IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider(int startOffset, IType type, AstNode resolvedNode)
152+
IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider(int startOffset, IType type, IEnumerable<IProperty> accessibleIndexers, AstNode resolvedNode)
153153
{
154-
return CreateMethodDataProvider(startOffset, type.GetProperties(p => p.IsIndexer));
154+
return CreateMethodDataProvider(startOffset, accessibleIndexers);
155155
}
156156

157157
IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider(int startOffset, IEnumerable<IType> types)

‎src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class SDRefactoringContext : RefactoringContext
2828
readonly ITextEditor editor;
2929
readonly ITextSource textSource;
3030
readonly TextLocation location;
31-
volatile IDocument document;
31+
IDocument document;
3232
int selectionStart, selectionLength;
3333

3434
public static SDRefactoringContext Create(ITextEditor editor, CancellationToken cancellationToken)

‎src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<Name>ICSharpCode.AvalonEdit</Name>
162162
<Private>False</Private>
163163
</ProjectReference>
164-
<ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
164+
<ProjectReference Include="..\..\..\Libraries\cecil\Mono.Cecil.csproj">
165165
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
166166
<Name>Mono.Cecil</Name>
167167
<Private>False</Private>

‎src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,19 @@ protected override bool ShowBookmarkInThisPad(SDBookmark mark)
2929
return mark.IsVisibleInBookmarkPad && mark is BreakpointBookmark;
3030
}
3131

32+
/*
3233
protected override void OnItemActivated(SDBookmark bookmark)
3334
{
3435
if (bookmark is DecompiledBreakpointBookmark) {
35-
// // get information from breakpoint and navigate to the decompiled type
36-
// string assemblyFile, typeName;
37-
// if (DecompiledBreakpointBookmark.GetAssemblyAndType(bookmark.FileName, out assemblyFile, out typeName)) {
38-
// NavigationService.NavigateTo(assemblyFile, typeName, string.Empty, bookmark.LineNumber, false);
39-
// }
36+
// get information from breakpoint and navigate to the decompiled type
37+
string assemblyFile, typeName;
38+
if (DecompiledBreakpointBookmark.GetAssemblyAndType(bookmark.FileName, out assemblyFile, out typeName)) {
39+
NavigationService.NavigateTo(assemblyFile, typeName, string.Empty, bookmark.LineNumber, false);
40+
}
4041
throw new NotImplementedException();
4142
} else {
4243
base.OnItemActivated(bookmark);
4344
}
44-
}
45+
}*/
4546
}
4647
}

‎src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,8 @@ void AddBreakpoint(BreakpointBookmark bookmark)
409409
{
410410
Breakpoint breakpoint = null;
411411

412-
if (bookmark is DecompiledBreakpointBookmark) {
412+
#warning decompiler
413+
/*if (bookmark is DecompiledBreakpointBookmark) {
413414
try {
414415
if (debuggerDecompilerService == null) {
415416
LoggingService.Warn("No IDebuggerDecompilerService found!");
@@ -429,16 +430,15 @@ void AddBreakpoint(BreakpointBookmark bookmark)
429430
430431
int[] ilRanges;
431432
int methodToken;
432-
#warning decompiler
433433
// if (debuggerDecompilerService.GetILAndTokenByLineNumber(token, dbb.LineNumber, out ilRanges, out methodToken)) {
434434
// CurrentDebugger.AddILBreakpoint(memberReference.FullName, dbb.LineNumber, memberReference.MetadataToken.ToInt32(), methodToken, ilRanges[0], dbb.IsEnabled);
435435
// }
436436
} catch (System.Exception ex) {
437437
LoggingService.Error("Error on DecompiledBreakpointBookmark: " + ex.Message);
438438
}
439-
} else {
440-
breakpoint = CurrentDebugger.AddBreakpoint(bookmark.FileName, bookmark.LineNumber, 0, bookmark.IsEnabled);
441-
}
439+
} else {*/
440+
breakpoint = CurrentDebugger.AddBreakpoint(bookmark.FileName, bookmark.LineNumber, 0, bookmark.IsEnabled);
441+
//}
442442

443443
if (breakpoint == null) {
444444
LoggingService.Warn(string.Format("unable to create breakpoint: {0}", bookmark.ToString()));

‎src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<Folder Include="Interop" />
127127
</ItemGroup>
128128
<ItemGroup>
129-
<ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
129+
<ProjectReference Include="..\..\..\Libraries\cecil\Mono.Cecil.csproj">
130130
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
131131
<Name>Mono.Cecil</Name>
132132
<Private>False</Private>

‎src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,6 @@
224224
<Name>ICSharpCode.AvalonEdit</Name>
225225
<Private>False</Private>
226226
</ProjectReference>
227-
<ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
228-
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
229-
<Name>Mono.Cecil</Name>
230-
<Private>False</Private>
231-
</ProjectReference>
232227
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
233228
<Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
234229
<Name>ICSharpCode.NRefactory.Xml</Name>

‎src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
9595
<Name>ICSharpCode.Decompiler</Name>
9696
</ProjectReference>
97-
<ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
97+
<ProjectReference Include="..\..\..\Libraries\cecil\Mono.Cecil.csproj">
9898
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
9999
<Name>Mono.Cecil</Name>
100100
<Private>False</Private>

0 commit comments

Comments
 (0)