paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 10:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IdeDebugger: rename "ValueFormatResolver" to "DisplayFormatResolver"

Browse Source
This commit is contained in:
Martin 2024-04-15 17:42:55 +02:00
parent 755dea7b4d
commit 41ffb45cda
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/debugmanager.pas
View File

@ -2508,11 +2508,11 @@ begin
if (Project1 = nil) or (DbgProjectLink.UseValueFormatterFromIDE) then
DebuggerOptions.ValueFormatterConfig.AssignEnabledTo(ValueFormatterSelectorList, True);
HintWatchPrinter.ValueFormatResolver.FallBackFormats.Clear;
HintWatchPrinter.DisplayFormatResolver.FallBackFormats.Clear;
if DbgProjectLink.UseDisplayFormatConfigsFromIDE then
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(HintWatchPrinter.ValueFormatResolver.FallBackFormats, dtfHint);
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(HintWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfHint);
if DbgProjectLink.UseDisplayFormatConfigsFromProject then
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(HintWatchPrinter.ValueFormatResolver.FallBackFormats, dtfHint);
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(HintWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfHint);
for d in TDebugDialogType do
if FDialogs[d] <> nil then

6
ide/packages/idedebugger/evaluatedlg.pp
View File

@ -172,11 +172,11 @@ end;
procedure TEvaluateDlg.DebugConfigChanged;
begin
inherited DebugConfigChanged;
FWatchPrinter.ValueFormatResolver.FallBackFormats.Clear;
FWatchPrinter.DisplayFormatResolver.FallBackFormats.Clear;
if DbgProjectLink.UseDisplayFormatConfigsFromIDE then
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfEvalMod);
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfEvalMod);
if DbgProjectLink.UseDisplayFormatConfigsFromProject then
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfEvalMod);
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfEvalMod);
DoDispFormatChanged(nil);
end;

24
ide/packages/idedebugger/idedebuggerwatchresprinter.pas
View File

@ -68,7 +68,7 @@ type
FFormatFlags: TWatchResultPrinterFormatFlags;
FLineSeparator: String;
FTargetAddressSize: integer;
FValueFormatResolver: TDisplayFormatResolver;
FDisplayFormatResolver: TDisplayFormatResolver;
protected const
MAX_ALLOWED_NEST_LVL = 100;
protected
@ -91,7 +91,7 @@ type
property FormatFlags: TWatchResultPrinterFormatFlags read FFormatFlags write FFormatFlags;
property TargetAddressSize: integer read FTargetAddressSize write FTargetAddressSize;
property ValueFormatResolver: TDisplayFormatResolver read FValueFormatResolver;
property DisplayFormatResolver: TDisplayFormatResolver read FDisplayFormatResolver;
end;
const
@ -582,7 +582,7 @@ var
vis, indent, sep, tn, Header: String;
InclVisSect: Boolean;
begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Result := '';
tn := AResValue.TypeName;
@ -721,7 +721,7 @@ var
Resolved: TResolvedDisplayFormat;
s: String;
begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Result := PrintNumber(AResValue.AsQWord, AResValue.AsInt64, TargetAddressSize, Resolved.Num2, True);
if AResValue.AsString <> '' then
@ -751,7 +751,7 @@ function TWatchResultPrinter.PrintWatchValueEx(AResValue: TWatchResultData;
Resolved: TResolvedDisplayFormat;
s: String;
begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
result := '';
s := '';
@ -780,7 +780,7 @@ function TWatchResultPrinter.PrintWatchValueEx(AResValue: TWatchResultData;
c: QWord;
s: String;
begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
c := AResValue.AsQWord;
result := '';
@ -805,7 +805,7 @@ function TWatchResultPrinter.PrintWatchValueEx(AResValue: TWatchResultData;
Resolved: TResolvedDisplayFormat;
s: String;
begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
result := '';
s := '';
@ -864,7 +864,7 @@ begin
end;
rdkSignedNumVal,
rdkUnsignedNumVal: begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Result := PrintNumber(AResValue.AsQWord, AResValue.AsInt64, AResValue.ByteSize, Resolved.Num1);
if Resolved.Num2.Visible then begin;
Result := Result +' = ' +
@ -872,7 +872,7 @@ begin
end;
end;
rdkPointerVal: begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Result := '';
PtrDeref := PointerValue.DerefData;
@ -905,7 +905,7 @@ begin
end;
end;
rdkFloatVal: begin
Resolved := ValueFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
if Resolved.Float.NumFormat = vdfFloatScientific then
case AResValue.FloatPrecission of
dfpSingle: Result := FloatToStrF(AResValue.AsFloat, ffExponent, 9, 0);
@ -948,13 +948,13 @@ constructor TWatchResultPrinter.Create;
begin
FFormatFlags := [rpfMultiLine, rpfIndent];
FTargetAddressSize := SizeOf(Pointer); // TODO: ask debugger
FValueFormatResolver := TDisplayFormatResolver.Create;
FDisplayFormatResolver := TDisplayFormatResolver.Create;
end;
destructor TWatchResultPrinter.Destroy;
begin
inherited Destroy;
FValueFormatResolver.Free;
FDisplayFormatResolver.Free;
end;
function TWatchResultPrinter.PrintWatchValue(AResValue: TWatchResultData;

6
ide/packages/idedebugger/inspectdlg.pas
View File

@ -1326,11 +1326,11 @@ end;
procedure TIDEInspectDlg.DebugConfigChanged;
begin
inherited DebugConfigChanged;
FWatchPrinter.ValueFormatResolver.FallBackFormats.Clear;
FWatchPrinter.DisplayFormatResolver.FallBackFormats.Clear;
if DbgProjectLink.UseDisplayFormatConfigsFromIDE then
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfInspect);
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfInspect);
if DbgProjectLink.UseDisplayFormatConfigsFromProject then
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfInspect);
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfInspect);
DoDispFormatChanged(Nil);
end;

6
ide/packages/idedebugger/localsdlg.pp
View File

@ -379,11 +379,11 @@ end;
procedure TLocalsDlg.DebugConfigChanged;
begin
inherited DebugConfigChanged;
FWatchPrinter.ValueFormatResolver.FallBackFormats.Clear;
FWatchPrinter.DisplayFormatResolver.FallBackFormats.Clear;
if DbgProjectLink.UseDisplayFormatConfigsFromIDE then
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfLocals);
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfLocals);
if DbgProjectLink.UseDisplayFormatConfigsFromProject then
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfLocals);
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfLocals);
LocalsChanged(nil);
end;

6
ide/packages/idedebugger/watchesdlg.pp
View File

@ -379,11 +379,11 @@ end;
procedure TWatchesDlg.DebugConfigChanged;
begin
inherited DebugConfigChanged;
FWatchPrinter.ValueFormatResolver.FallBackFormats.Clear;
FWatchPrinter.DisplayFormatResolver.FallBackFormats.Clear;
if DbgProjectLink.UseDisplayFormatConfigsFromIDE then
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfWatches);
DebuggerOptions.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfWatches);
if DbgProjectLink.UseDisplayFormatConfigsFromProject then
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.ValueFormatResolver.FallBackFormats, dtfWatches);
DbgProjectLink.DisplayFormatConfigs.AddToTargetedList(FWatchPrinter.DisplayFormatResolver.FallBackFormats, dtfWatches);
UpdateAll;
end;