Fix 935181: TryGetBreakpointSpan called with invalid position

I also added logic to fallback to whole line breakpoint in case Roslyn fails to find matching statement to place breakpoint on.

1 files changed, 3 insertions, 3 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/CSharpBreakpointSpanResolver.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/CSharpBreakpointSpanResolver.cs
index f21971dc9f..e3d57dcec6 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/CSharpBreakpointSpanResolver.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/CSharpBreakpointSpanResolver.cs
@@ -50,9 +50,9 @@ namespace MonoDevelop.CSharp.Debugger
 			var document = buffer.AsTextContainer ().GetOpenDocumentInCurrentContext ();
 			var tree = await document.GetSyntaxTreeAsync (cancellationToken);
 
-			BreakpointSpans.TryGetBreakpointSpan (tree, position, cancellationToken, out var span);
-
-			return new Span (span.Start, span.Length);
+			if (BreakpointSpans.TryGetBreakpointSpan (tree, Math.Max (0, Math.Min (position, tree.Length - 1)), cancellationToken, out var span))
+				return new Span (span.Start, span.Length);
+			return buffer.CurrentSnapshot.GetLineFromPosition (Math.Max (0, Math.Min (position, buffer.CurrentSnapshot.Length - 1))).Extent.Span;
 		}
 	}
 }