Browse Source

Remove 'dynamic' usage in DebuggerService.HandleToolTipRequest

pull/15/merge
Daniel Grunwald 14 years ago
parent
commit
0b5295f6c1
  1. 2
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/TextMarkerService.cs
  2. 1
      src/Main/Base/Project/Src/Gui/IWorkbenchWindow.cs
  3. 8
      src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs

2
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/TextMarkerService.cs

@ -147,7 +147,7 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -147,7 +147,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
if (visualLines.Count == 0)
return;
int viewStart = visualLines.First().FirstDocumentLine.Offset;
int viewEnd = visualLines.Last().LastDocumentLine.Offset + visualLines.Last().LastDocumentLine.Length;
int viewEnd = visualLines.Last().LastDocumentLine.EndOffset;
foreach (TextMarker marker in markers.FindOverlappingSegments(viewStart, viewEnd - viewStart)) {
if (marker.BackgroundColor != null) {
BackgroundGeometryBuilder geoBuilder = new BackgroundGeometryBuilder();

1
src/Main/Base/Project/Src/Gui/IWorkbenchWindow.cs

@ -22,6 +22,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -22,6 +22,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// <summary>
/// Gets if the workbench window has been disposed.
/// </summary>
[Obsolete("This property always returns false.")]
bool IsDisposed {
get;
}

8
src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs

@ -278,13 +278,7 @@ namespace ICSharpCode.SharpDevelop.Debugging @@ -278,13 +278,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
return;
Location logicPos = e.LogicalPosition;
var doc = e.Editor.Document;
string fileName;
if (!File.Exists(e.Editor.FileName)) {
dynamic viewContent = WorkbenchSingleton.Workbench.ActiveViewContent;
fileName = string.Format("decompiled/{0}.cs", viewContent.FullTypeName);
} else {
fileName = e.Editor.FileName;
}
FileName fileName = e.Editor.FileName;
IExpressionFinder expressionFinder = ParserService.GetExpressionFinder(fileName);
if (expressionFinder == null)

Loading…
Cancel
Save