Browse Source

Reverted some convenience methods from r4745

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4764 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 16 years ago
parent
commit
bac075bbcd
  1. 9
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs
  2. 8
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs

9
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs

@ -185,16 +185,13 @@ namespace Debugger
} }
} }
public void TraceVerboseMessage(string message, params object[] args) public void TraceMessage(string message, params object[] args)
{ {
if (this.Options.Verbose) TraceMessage(string.Format(message, args));
TraceMessage(message, args);
} }
public void TraceMessage(string message, params object[] args) public void TraceMessage(string message)
{ {
if (args.Length > 0)
message = string.Format(message, args);
System.Diagnostics.Debug.WriteLine("Debugger:" + message); System.Diagnostics.Debug.WriteLine("Debugger:" + message);
debugger.OnDebuggerTraceMessage(new MessageEventArgs(this, message)); debugger.OnDebuggerTraceMessage(new MessageEventArgs(this, message));
} }

8
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs

@ -240,18 +240,14 @@ namespace Debugger
public void EvalException(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, ICorDebugEval corEval) public void EvalException(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, ICorDebugEval corEval)
{ {
Eval eval = process.ActiveEvals[corEval]; EnterCallback(PausedReason.EvalComplete, "EvalException", pThread);
EnterCallback(PausedReason.EvalComplete, "EvalException: " + eval.Description, pThread);
HandleEvalComplete(pAppDomain, pThread, corEval, true); HandleEvalComplete(pAppDomain, pThread, corEval, true);
} }
public void EvalComplete(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, ICorDebugEval corEval) public void EvalComplete(ICorDebugAppDomain pAppDomain, ICorDebugThread pThread, ICorDebugEval corEval)
{ {
Eval eval = process.ActiveEvals[corEval]; EnterCallback(PausedReason.EvalComplete, "EvalComplete", pThread);
EnterCallback(PausedReason.EvalComplete, "EvalComplete: " + eval.Description, pThread);
HandleEvalComplete(pAppDomain, pThread, corEval, false); HandleEvalComplete(pAppDomain, pThread, corEval, false);
} }

Loading…
Cancel
Save