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

IDE: prevent exceptions (in debugger eval hint) from being passed back to the debugger

Browse Source 
git-svn-id: trunk@63739 -
This commit is contained in:
martin 2020-08-15 02:29:41 +00:00
parent 084616c388
commit 68b18e0e2b
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ide/main.pp
View File

@ -11402,34 +11402,42 @@ procedure TSrcNotebookHintCallback.AddDebuggerResult(Sender: TObject;
var
Opts: TDBGEvaluateFlags;
begin
if not ASuccess then begin
FDebugResText := '???';
end
else begin
// deference a pointer - maybe it is a class
if ASuccess and Assigned(ResultDBGType) and (ResultDBGType.Kind in [skPointer]) and
not( StringCase(Lowercase(ResultDBGType.TypeName), ['char', 'character', 'ansistring']) in [0..2] )
then
begin
if ResultDBGType.Value.AsPointer <> nil then
try
if not ASuccess then begin
FDebugResText := '???';
end
else begin
// deference a pointer - maybe it is a class
if ASuccess and Assigned(ResultDBGType) and (ResultDBGType.Kind in [skPointer]) and
not( StringCase(Lowercase(ResultDBGType.TypeName), ['char', 'character', 'ansistring']) in [0..2] )
then
begin
Opts := [];
if EditorOpts.DbgHintAutoTypeCastClass
then Opts := [defClassAutoCast];
if ResultDBGType.Value.AsPointer <> nil then
begin
Opts := [];
if EditorOpts.DbgHintAutoTypeCastClass
then Opts := [defClassAutoCast];
FDebugResText := ResultText;
FDebugResText := ResultText;
if DebugBoss.Evaluate('('+FExpression + ')^', @AddDebuggerResultDeref, Opts) then begin
FreeAndNil(ResultDBGType);
exit;
if DebugBoss.Evaluate('('+FExpression + ')^', @AddDebuggerResultDeref, Opts) then begin
FreeAndNil(ResultDBGType);
exit;
end;
end;
end;
end else
FDebugResText := DebugBoss.FormatValue(ResultDBGType, ResultText);
end else
FDebugResText := DebugBoss.FormatValue(ResultDBGType, ResultText);
FreeAndNil(ResultDBGType);
FreeAndNil(ResultDBGType);
end;
ShowHint;
except
on E: Exception do
try
IDEMessageDialog('Error',E.Message,mtError,[mbCancel]);
except
end;
end;
ShowHint;
end;
procedure TSrcNotebookHintCallback.AddDebuggerResultDeref(Sender: TObject;