Merge pull request #194 from joj/cctor

Fixed steping on static constructor and methods they call

Author: DavidKarlas

Mono.Debugging.Soft/SoftDebuggerSession.cs

@@ -1418,7 +1418,7 @@ void Step (StepDepth depth, StepSize size)
 					var req = vm.CreateStepRequest (current_thread);
 					req.Depth = depth;
 					req.Size = size;
-					req.Filter = StepFilter.StaticCtor | StepFilter.DebuggerHidden | StepFilter.DebuggerStepThrough;
+					req.Filter = ShouldFilterStaticCtor() | StepFilter.DebuggerHidden | StepFilter.DebuggerStepThrough;
 					if (Options.ProjectAssembliesOnly)
 						req.Filter |= StepFilter.DebuggerNonUserCode;
 					if (assemblyFilters != null && assemblyFilters.Count > 0)
@@ -1452,7 +1452,14 @@ void Step (StepDepth depth, StepSize size)
 					DebuggerLoggingService.LogError ("Step request failed", ex);
 				}
 			});
-		}
+		}
+
+		private StepFilter ShouldFilterStaticCtor()
+		{
+			var frames = current_thread.GetFrames();
+			return (frames.Any(f => f.Method.Name == ".cctor" && f.Method.IsSpecialName && f.Method.IsStatic))
+				? StepFilter.None : StepFilter.StaticCtor;
+		}
 
 		void EventHandler ()
 		{