paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 15:57:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Fix Run menu, to show correct available debugger commands

Browse Source 
git-svn-id: trunk@63306 -
This commit is contained in:
martin 2020-06-06 00:53:49 +00:00
parent 4f5896d680
commit 06b1a964b6
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/debuggerintf/dbgintfdebuggerbase.pp
View File

@ -2070,9 +2070,10 @@ var
const
COMMANDMAP: array[TDBGState] of TDBGCommands = (
{dsNone } [],
{dsIdle } [dcEnvironment],
{dsIdle } [dcRun, dcStepOver, dcStepInto, dcStepOverInstr, dcStepIntoInstr, dcRunTo,
dcAttach, dcBreak, dcWatch, {dcEvaluate,} dcEnvironment],
{dsStop } [dcRun, dcStepOver, dcStepInto, dcStepOverInstr, dcStepIntoInstr, dcRunTo,
dcAttach, dcBreak, dcWatch, dcEvaluate, dcEnvironment,
dcAttach, dcBreak, dcWatch, {dcEvaluate,} dcEnvironment,
dcSendConsoleInput],
{dsPause} [dcRun, dcStop, dcStepOver, dcStepInto, dcStepOverInstr, dcStepIntoInstr,
dcStepOut, dcStepTo, dcRunTo, dcJumpto, dcDetach, dcBreak, dcWatch, dcLocal, dcEvaluate, dcModify,

17
ide/debugmanager.pas
View File

@ -2075,7 +2075,9 @@ var
begin
if (MainIDE=nil) or (MainIDE.ToolStatus = itExiting) then exit;
DebuggerIsValid:=(FDebugger<>nil) and (MainIDE.ToolStatus=itDebugger);
if FDebugger = nil then
InitDebugger(); // make sure we get the supported commands
DebuggerIsValid:=(FDebugger<>nil) and (MainIDE.ToolStatus in [itNone, itDebugger]);
MainIDE.GetCurrentUnitInfo(SrcEdit,AnUnitInfo);
with MainIDEBar do begin
// For 'run' and 'step' bypass 'idle', so we can set the filename later
@ -2088,7 +2090,7 @@ begin
);
// Run
itmRunMenuRun.Enabled := CanRun and (not DebuggerIsValid
or (dcRun in FDebugger.Commands) or (FDebugger.State = dsIdle));
or (dcRun in FDebugger.Commands));
// Pause
itmRunMenuPause.Enabled := CanRun and DebuggerIsValid
and ((dcPause in FDebugger.Commands) or FAutoContinueTimer.Enabled);
@ -2097,10 +2099,10 @@ begin
and (FDebugger.State = dsPause);
// Step into
itmRunMenuStepInto.Enabled := CanRun and (not DebuggerIsValid
or (dcStepInto in FDebugger.Commands) or (FDebugger.State = dsIdle));
or (dcStepInto in FDebugger.Commands));
// Step over
itmRunMenuStepOver.Enabled := CanRun and (not DebuggerIsValid
or (dcStepOver in FDebugger.Commands) or (FDebugger.State = dsIdle));
or (dcStepOver in FDebugger.Commands));
// Step out
itmRunMenuStepOut.Enabled := CanRun and DebuggerIsValid
and (dcStepOut in FDebugger.Commands) and (FDebugger.State = dsPause);
@ -2111,7 +2113,8 @@ begin
itmRunMenuRunToCursor.Enabled := CanRun and DebuggerIsValid
and (dcRunTo in FDebugger.Commands);
// Stop
itmRunMenuStop.Enabled := CanRun and DebuggerIsValid;
itmRunMenuStop.Enabled := CanRun and DebuggerIsValid and (MainIDE.ToolStatus = itDebugger) and
(FDebugger.State in [dsPause, dsInternalPause, dsInit, dsRun, dsError]);
//Attach / Detach
itmRunMenuAttach.Enabled := (not DebuggerIsValid) or (dcAttach in FDebugger.Commands);
@ -2147,7 +2150,7 @@ procedure TDebugManager.UpdateToolStatus;
const
TOOLSTATEMAP: array[TDBGState] of TIDEToolStatus = (
//dsNone, dsIdle, dsStop, dsPause, dsInternalPause, dsInit, dsRun, dsError, dsDestroying
itNone, itNone, itDebugger, itDebugger, itDebugger, itDebugger, itDebugger, itNone, itNone
itNone, itNone, itNone, itDebugger, itDebugger, itDebugger, itDebugger, itNone, itNone
);
begin
// Next may call ResetDebugger, then FDebugger is gone
@ -2428,7 +2431,7 @@ begin
exit;
end;
if Destroying then Exit;
if Destroying or (Project1 = nil) then Exit;
if not(difInitForAttach in AFlags) then begin
if (Project1.MainUnitID < 0) then Exit;
if not GetLaunchPathAndExe(LaunchingCmdLine, LaunchingApplication, LaunchingParams) then