Merge pull request #1775 from JetBrains/corDebugBreakpointInsertionFixes

Fixed way of choosing best sequence point for breakpoints in CorDebuggerSession

Author: David Karlaš

Mono.Debugging.Win32/CorDebuggerSession.cs

@@ -1049,55 +1049,92 @@ protected override BreakEventInfo OnInsertBreakEvent (BreakEvent be)
 							binfo.SetStatus (BreakEventStatus.Invalid, string.Format("Invalid line {0}", bp.Line));
 							return binfo;
 						}
-						ISymbolMethod met = null;
+						ISymbolMethod[] methods = null;
 						if (doc.ModuleInfo.Reader is ISymbolReader2) {
-							var methods = ((ISymbolReader2)doc.ModuleInfo.Reader).GetMethodsFromDocumentPosition (doc.Document, line, 0);
-							if (methods != null && methods.Any ()) {
-								if (methods.Count () == 1) {
-									met = methods [0];
-								} else {
-									int deepest = -1;
-									foreach (var method in methods) {
-										var firstSequence = method.GetSequencePoints ().FirstOrDefault ((sp) => sp.StartLine != 0xfeefee);
-										if (firstSequence != null && firstSequence.StartLine >= deepest) {
-											deepest = firstSequence.StartLine;
-											met = method;
-										}
-									}
-								}
-							}
+							methods = ((ISymbolReader2)doc.ModuleInfo.Reader).GetMethodsFromDocumentPosition (doc.Document, line, 0);
 						}
-						if (met == null) {
-							met = doc.ModuleInfo.Reader.GetMethodFromDocumentPosition (doc.Document, line, 0);
+						if (methods == null || methods.Length == 0) {
+							var met = doc.ModuleInfo.Reader.GetMethodFromDocumentPosition (doc.Document, line, 0);
+							if (met != null)
+								methods = new ISymbolMethod[] {met};
 						}
-						if (met == null) {
+
+						if (methods == null || methods.Length == 0) {
 							binfo.SetStatus (BreakEventStatus.Invalid, "Unable to resolve method at position");
 							return binfo;
 						}
 
-						int offset = -1;
-						int firstSpInLine = -1;
-						foreach (SequencePoint sp in met.GetSequencePoints ()) {
-							if (sp.IsInside (doc.Document.URL, line, bp.Column)) {
-								offset = sp.Offset;
-								break;
-							} else if (firstSpInLine == -1
-									   && sp.StartLine == line
-									   && sp.Document.URL.Equals (doc.Document.URL, StringComparison.OrdinalIgnoreCase)) {
-								firstSpInLine = sp.Offset;
+						ISymbolMethod bestMethod = null;
+						ISymbolMethod bestLeftSideMethod = null;
+						ISymbolMethod bestRightSideMethod = null;
+
+						SequencePoint bestSp = null;
+						SequencePoint bestLeftSideSp = null;
+						SequencePoint bestRightSideSp = null;
+
+						foreach (var met in methods) {
+							foreach (SequencePoint sp in met.GetSequencePoints ()) {
+								if (sp.IsInside (doc.Document.URL, line, bp.Column)) {	//breakpoint is inside current sequence point
+									if (bestSp == null || bestSp.IsInside (doc.Document.URL, sp.StartLine, sp.StartColumn)) {	//and sp is inside of current candidate
+										bestSp = sp;
+										bestMethod = met;
+										break;
+									}
+								} else if (sp.StartLine == line
+								           && sp.Document.URL.Equals (doc.Document.URL, StringComparison.OrdinalIgnoreCase)
+								           && sp.StartColumn <= bp.Column) {	//breakpoint is on the same line and on the right side of sp
+									if (bestLeftSideSp == null
+									    || bestLeftSideSp.EndColumn < sp.EndColumn) {
+										bestLeftSideSp = sp;
+										bestLeftSideMethod = met;
+									}
+								} else if (sp.StartLine >= line
+								           && sp.Document.URL.Equals (doc.Document.URL, StringComparison.OrdinalIgnoreCase)) {	//sp is after bp
+									if (bestRightSideSp == null
+									    || bestRightSideSp.StartLine > sp.StartLine
+									    || (bestRightSideSp.StartLine == sp.StartLine && bestRightSideSp.StartColumn > sp.StartColumn)) { //and current candidate is on the right side of it
+										bestRightSideSp = sp;
+										bestRightSideMethod = met;
+									}
+								}
 							}
 						}
-						if (offset == -1) {//No exact match? Use first match in that line
-							offset = firstSpInLine;
+
+						SequencePoint bestSameLineSp;
+						ISymbolMethod bestSameLineMethod;
+
+						if (bestRightSideSp != null
+						    && (bestLeftSideSp == null
+						        || bestRightSideSp.StartLine > line)) {
+							bestSameLineSp = bestRightSideSp;
+							bestSameLineMethod = bestRightSideMethod;
+						}
+						else {
+							bestSameLineSp = bestLeftSideSp;
+							bestSameLineMethod = bestLeftSideMethod;
 						}
-						if (offset == -1) {
+
+						if (bestSameLineSp != null) {
+							if (bestSp == null) {
+								bestSp = bestSameLineSp;
+								bestMethod = bestSameLineMethod;
+							}
+							else {
+								if (bp.Line != bestSp.StartLine || bestSp.StartColumn != bp.Column) {
+									bestSp = bestSameLineSp;
+									bestMethod = bestSameLineMethod;
+								}
+							}
+						}
+
+						if (bestSp == null || bestMethod == null) {
 							binfo.SetStatus (BreakEventStatus.Invalid, "Unable to calculate an offset in IL code");
 							return binfo;
 						}
 
-						CorFunction func = doc.ModuleInfo.Module.GetFunctionFromToken (met.Token.GetToken ());
+						CorFunction func = doc.ModuleInfo.Module.GetFunctionFromToken (bestMethod.Token.GetToken ());
 						try {
-							CorFunctionBreakpoint corBp = func.ILCode.CreateBreakpoint (offset);
+							CorFunctionBreakpoint corBp = func.ILCode.CreateBreakpoint (bestSp.Offset);
 							breakpoints[corBp] = binfo;
 							binfo.Handle = corBp;
 							corBp.Activate (bp.Enabled);