fix stepping

Debugger/Debugger.Core/Options.cs

@@ -5,7 +5,7 @@ namespace Debugger
 {
 	public class Options
 	{
-		public bool EnableJustMyCode = true;
+		public bool EnableJustMyCode = false;
 		public bool StepOverNoSymbols = false;
 		public bool StepOverDebuggerAttributes = true;
 		public bool StepOverAllProperties = false;

Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs

@@ -287,27 +287,27 @@ namespace ILSpy.Debugger.Services
 		
 		// Stepping:
 		
-		SourceCodeMapping GetNextCodeMapping()
+		SourceCodeMapping GetCurrentCodeMapping()
 		{
 			if (CurrentLineBookmark.Instance == null)
 				return null;
 			
 			// get the mapped instruction from the current line marker or the next one
 			uint token;
-			var instruction = CodeMappingsStorage.GetInstructionByTypeAndLine(
+			return CodeMappingsStorage.GetInstructionByTypeAndLine(
 				CurrentLineBookmark.Instance.Type.FullName,
 				CurrentLineBookmark.Instance.LineNumber, out token);
 			
-			var val = CodeMappingsStorage[CurrentLineBookmark.Instance.Type.FullName];
+//			var val = CodeMappingsStorage[CurrentLineBookmark.Instance.Type.FullName];
-			
+//			
-			var mapping = val.Find(m => m.MetadataToken == token);
+//			var mapping = val.Find(m => m.MetadataToken == token);
-			
+//			
-			return mapping.MemberCodeMappings.FirstOrDefault(s => s.ILInstructionOffset.From == instruction.ILInstructionOffset.From);
+//			return mapping.MemberCodeMappings.FirstOrDefault(s => s.ILInstructionOffset.From == instruction.ILInstructionOffset.From);
 		}
 		
 		StackFrame GetStackFrame()
 		{
-			var map = GetNextCodeMapping();
+			var map = GetCurrentCodeMapping();
 			if (map == null) {
 				CurrentLineBookmark.Remove();
 				Continue();

ICSharpCode.Decompiler/Ast/TextOutputFormatter.cs

@@ -132,11 +132,20 @@ namespace ICSharpCode.Decompiler.Ast
 					var n = node.Ancestors.FirstOrDefault(a => a.Annotation<MemberMapping>() != null);
 					if (n != default(AstType)) {
 						MemberMapping mapping = n.Annotation<MemberMapping>();
+						var map = mapping.MemberCodeMappings.Find(s => s.SourceCodeLine == output.CurrentLine);
+						
 						foreach (var range in ranges) {
-							mapping.MemberCodeMappings.Add(new SourceCodeMapping {
+							if (map == null) {
-							                               	ILInstructionOffset = range,
+								mapping.MemberCodeMappings.Add(new SourceCodeMapping {
-							                               	SourceCodeLine = output.CurrentLine
+								                               	ILInstructionOffset = range,
-							                               });
+								                               	SourceCodeLine = output.CurrentLine
+								                               });
+							} else {
+								if (map.ILInstructionOffset.From > range.From)
+									map.ILInstructionOffset.From = range.From;
+								if (map.ILInstructionOffset.To < range.To)
+									map.ILInstructionOffset.To = range.To;
+							}
 						}
 					}
 				}