Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@wtfsck
wtfsck committed Oct 19, 2017
1 parent 2f47f34 commit e63d02e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/DbgEngineImpl.Evaluation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ internal string StoreValue_CorDebug(DbgEvaluationContext context, DbgThread thre
debuggerThread.VerifyAccess();

if (RequiresNoFuncEvalToStoreValue(targetType, sourceValue))
return StoreSimpleValue_CorDegbug(context, thread, ilFrame, createTargetValue, targetType, sourceValue, cancellationToken);
return StoreSimpleValue_CorDebug(context, thread, ilFrame, createTargetValue, targetType, sourceValue, cancellationToken);

cancellationToken.ThrowIfCancellationRequested();
var tmp = CheckFuncEval(context);
Expand Down Expand Up @@ -382,7 +382,7 @@ internal string StoreValue_CorDebug(DbgEvaluationContext context, DbgThread thre
createResult = createTargetValue();
if (createResult.Value == null)
return CordbgErrorHelper.GetErrorMessage(createResult.HResult);
return StoreValue_CorDegbug(dnEval, createdValues, appDomain, dnThread, createResult.Value, targetType, sourceCorValue, sourceType);
return StoreValue_CorDebug(dnEval, createdValues, appDomain, dnThread, createResult.Value, targetType, sourceCorValue, sourceType);
}
}
catch (TimeoutException) {
Expand All @@ -399,7 +399,7 @@ internal string StoreValue_CorDebug(DbgEvaluationContext context, DbgThread thre
}
}

string StoreValue_CorDegbug(DnEval dnEval, List<CorValue> createdValues, CorAppDomain appDomain, DnThread dnThread, CorValue targetValue, DmdType targetType, CorValue sourceValue, DmdType sourceType) {
string StoreValue_CorDebug(DnEval dnEval, List<CorValue> createdValues, CorAppDomain appDomain, DnThread dnThread, CorValue targetValue, DmdType targetType, CorValue sourceValue, DmdType sourceType) {
if (targetType.IsByRef)
return CordbgErrorHelper.InternalError;
if (!targetType.IsValueType) {
Expand Down Expand Up @@ -457,7 +457,7 @@ string StoreValue_CorDegbug(DnEval dnEval, List<CorValue> createdValues, CorAppD
}
}

string StoreSimpleValue_CorDegbug(DbgEvaluationContext context, DbgThread thread, ILDbgEngineStackFrame ilFrame, Func<CreateCorValueResult> createTargetValue, DmdType targetType, object sourceValue, CancellationToken cancellationToken) {
string StoreSimpleValue_CorDebug(DbgEvaluationContext context, DbgThread thread, ILDbgEngineStackFrame ilFrame, Func<CreateCorValueResult> createTargetValue, DmdType targetType, object sourceValue, CancellationToken cancellationToken) {
Debug.Assert(RequiresNoFuncEvalToStoreValue(targetType, sourceValue));
cancellationToken.ThrowIfCancellationRequested();
CreateCorValueResult createResult = default;
Expand All @@ -466,7 +466,7 @@ string StoreSimpleValue_CorDegbug(DbgEvaluationContext context, DbgThread thread
createResult = createTargetValue();
if (createResult.Value == null)
return CordbgErrorHelper.GetErrorMessage(createResult.HResult);
return StoreSimpleValue_CorDegbug(dnThread, createResult.Value, targetType, sourceValue);
return StoreSimpleValue_CorDebug(dnThread, createResult.Value, targetType, sourceValue);
}
catch (TimeoutException) {
return PredefinedEvaluationErrorMessages.FuncEvalTimedOut;
Expand Down Expand Up @@ -506,7 +506,7 @@ static bool RequiresNoFuncEvalToStoreValue(DmdType targetType, object sourceValu
return true;
}

string StoreSimpleValue_CorDegbug(DnThread dnThread, CorValue targetValue, DmdType targetType, object sourceValue) {
string StoreSimpleValue_CorDebug(DnThread dnThread, CorValue targetValue, DmdType targetType, object sourceValue) {
if (targetType.IsByRef)
return CordbgErrorHelper.InternalError;
if (targetType.IsPointer || targetType.IsFunctionPointer) {
Expand Down
4 changes: 2 additions & 2 deletions Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/DebugMenuCommands.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public override string GetInputGestureText(IMenuItemContext context) =>
}

[ExportMenuItem(OwnerGuid = MenuConstants.APP_MENU_DEBUG_GUID, Header = "res:StartWithoutDebuggingCommand", Icon = DsImagesAttribute.RunOutline, InputGestureText = "res:ShortCutKeyCtrlF5", Group = MenuConstants.GROUP_APP_MENU_DEBUG_START, Order = 10)]
sealed class StartWithoutDegbuggingDebugMainMenuCommand : DebugMainMenuCommand {
sealed class StartWithoutDebuggingDebugMainMenuCommand : DebugMainMenuCommand {
[ImportingConstructor]
public StartWithoutDegbuggingDebugMainMenuCommand(Lazy<Debugger> debugger)
public StartWithoutDebuggingDebugMainMenuCommand(Lazy<Debugger> debugger)
: base(debugger, null) {
}

Expand Down
12 changes: 6 additions & 6 deletions Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/Debugger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ abstract class Debugger {
public abstract bool CanDisableAllBreakpoints { get; }
public abstract void DisableAllBreakpoints();

public abstract bool CanContinueOrDegbugProgram { get; }
public abstract void ContinueOrDegbugProgram();
public abstract bool CanStepIntoOrDegbugProgram { get; }
public abstract void StepIntoOrDegbugProgram();
public abstract bool CanStepOverOrDegbugProgram { get; }
public abstract void StepOverOrDegbugProgram();
public abstract bool CanContinueOrDebugProgram { get; }
public abstract void ContinueOrDebugProgram();
public abstract bool CanStepIntoOrDebugProgram { get; }
public abstract void StepIntoOrDebugProgram();
public abstract bool CanStepOverOrDebugProgram { get; }
public abstract void StepOverOrDebugProgram();
}
}
12 changes: 6 additions & 6 deletions Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/DebuggerImpl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,24 +270,24 @@ void EnableAllBreakpoints(bool enable) {
}).ToArray());
}

public override bool CanContinueOrDegbugProgram => CanContinue || CanDebugProgram;
public override void ContinueOrDegbugProgram() {
public override bool CanContinueOrDebugProgram => CanContinue || CanDebugProgram;
public override void ContinueOrDebugProgram() {
if (CanContinue)
Continue();
else if (CanDebugProgram && !dbgManager.Value.IsDebugging)
DebugProgram(pauseAtEntryPoint: false);
}

public override bool CanStepIntoOrDegbugProgram => CanStepInto || CanDebugProgram;
public override void StepIntoOrDegbugProgram() {
public override bool CanStepIntoOrDebugProgram => CanStepInto || CanDebugProgram;
public override void StepIntoOrDebugProgram() {
if (CanStepInto)
StepInto();
else if (CanDebugProgram && !dbgManager.Value.IsDebugging)
DebugProgram(pauseAtEntryPoint: true);
}

public override bool CanStepOverOrDegbugProgram => CanStepOver || CanDebugProgram;
public override void StepOverOrDegbugProgram() {
public override bool CanStepOverOrDebugProgram => CanStepOver || CanDebugProgram;
public override void StepOverOrDebugProgram() {
if (CanStepOver)
StepOver();
else if (CanDebugProgram && !dbgManager.Value.IsDebugging)
Expand Down
6 changes: 3 additions & 3 deletions Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/KeyboardShortcutCommands.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ sealed class KeyboardShortcutCommands : IAutoLoaded {
cmds.Add(new RelayCommand(a => debugger.Value.BreakAll(), a => debugger.Value.CanBreakAll), ModifierKeys.Control | ModifierKeys.Alt, Key.Cancel);
cmds.Add(new RelayCommand(a => debugger.Value.Restart(), a => debugger.Value.CanRestart), ModifierKeys.Control | ModifierKeys.Shift, Key.F5);
cmds.Add(new RelayCommand(a => debugger.Value.StopDebugging(), a => debugger.Value.CanStopDebugging), ModifierKeys.Shift, Key.F5);
cmds.Add(new RelayCommand(a => debugger.Value.ContinueOrDegbugProgram(), a => debugger.Value.CanContinueOrDegbugProgram), ModifierKeys.None, Key.F5);
cmds.Add(new RelayCommand(a => debugger.Value.StepIntoOrDegbugProgram(), a => debugger.Value.CanStepIntoOrDegbugProgram), ModifierKeys.None, Key.F11);
cmds.Add(new RelayCommand(a => debugger.Value.StepOverOrDegbugProgram(), a => debugger.Value.CanStepOverOrDegbugProgram), ModifierKeys.None, Key.F10);
cmds.Add(new RelayCommand(a => debugger.Value.ContinueOrDebugProgram(), a => debugger.Value.CanContinueOrDebugProgram), ModifierKeys.None, Key.F5);
cmds.Add(new RelayCommand(a => debugger.Value.StepIntoOrDebugProgram(), a => debugger.Value.CanStepIntoOrDebugProgram), ModifierKeys.None, Key.F11);
cmds.Add(new RelayCommand(a => debugger.Value.StepOverOrDebugProgram(), a => debugger.Value.CanStepOverOrDebugProgram), ModifierKeys.None, Key.F10);
cmds.Add(new RelayCommand(a => debugger.Value.StepOut(), a => debugger.Value.CanStepOut), ModifierKeys.Shift, Key.F11);
cmds.Add(new RelayCommand(a => debugger.Value.ShowNextStatement(), a => debugger.Value.CanShowNextStatement), ModifierKeys.Alt, Key.Multiply);
cmds.Add(new RelayCommand(a => debugger.Value.SetNextStatement(), a => debugger.Value.CanSetNextStatement), ModifierKeys.Control | ModifierKeys.Shift, Key.F10);
Expand Down

0 comments on commit e63d02e

Please sign in to comment.