Debugger: fix typename with Json-display

debugger/inspectdlg.pas

@@ -370,7 +370,10 @@ begin
   AnchType := '';
   if Res.Anchestor <> nil then
     AnchType := Res.Anchestor.TypeName;
-  StatusBar1.SimpleText:=Format(lisInspectClassInherit, [ShortenedExpression, Res.TypeName, AnchType]);
+  if (Res.ValueKind = rdkStruct) and (AnchType <> '') then
+    StatusBar1.SimpleText:=Format(lisInspectClassInherit, [ShortenedExpression, Res.TypeName, AnchType])
+  else
+    StatusBar1.SimpleText:=ShortenedExpression+' : '+Res.TypeName + ' = ' + FHumanReadable;
 
   GridDataSetup;
   FldCnt := 0;

ide/packages/idedebugger/idedebuggerbase.pas

@@ -277,6 +277,9 @@ begin
 
       if (Result.ValueKind in [rdkString, rdkPrePrinted]) and (IsMaybeJson(Result.AsString)) then begin
         FResultDataSpecialised := TWatchResultDataJSon.Create(Result.AsString);
+        TWatchResultDataJSon(FResultDataSpecialised).SetTypeName(FResultData.TypeName);
+        if FResultData.HasDataAddress then
+          TWatchResultDataJSon(FResultDataSpecialised).SetDataAddress(FResultData.DataAddress);
         if (FResultDataSpecialised.Count > 0) or (FResultDataSpecialised.FieldCount > 0) then
           FResultDataContent := rdcJSon;
       end;

ide/packages/idedebugger/idedebuggerwatchresult.pas

@@ -96,6 +96,15 @@ type
   TWatchResultValueString = object(TWatchResultValueTextBase)
   protected const
     VKind = rdkString;
+  private
+    FAddress: TDBGPtr;
+  protected
+    procedure LoadDataFromXMLConfig(const AConfig: TXMLConfig; const APath: string;
+                                    const AnEntryTemplate: TWatchResultData;
+                                    var AnOverrideTemplate: TOverrideTemplateData;
+                                    AnAsProto: Boolean);
+    procedure SaveDataToXMLConfig(const AConfig: TXMLConfig; const APath: string; AnAsProto: Boolean);
+    property GetDataAddress: TDBGPtr read FAddress;
   end;
 
   { TWatchResultValueWideString }
@@ -1000,6 +1009,9 @@ type
   TWatchResultDataString = class(specialize TGenericWatchResultData<TWatchResultValueString>)
   private
     function GetClassID: TWatchResultDataClassID; override;
+  protected
+    function GetHasDataAddress: Boolean; override;
+    function GetDataAddress: TDBGPtr; override;
   public
     constructor Create(AStringVal: String);
   end;
@@ -1594,6 +1606,24 @@ begin
   AConfig.SetValue(APath + 'Value', FText);
 end;
 
+{ TWatchResultValueString }
+
+procedure TWatchResultValueString.LoadDataFromXMLConfig(
+  const AConfig: TXMLConfig; const APath: string;
+  const AnEntryTemplate: TWatchResultData;
+  var AnOverrideTemplate: TOverrideTemplateData; AnAsProto: Boolean);
+begin
+  inherited LoadDataFromXMLConfig(AConfig, APath, AnEntryTemplate, AnOverrideTemplate, AnAsProto);
+  FAddress := TDBGPtr(AConfig.GetValue(APath + 'Addr', 0));
+end;
+
+procedure TWatchResultValueString.SaveDataToXMLConfig(
+  const AConfig: TXMLConfig; const APath: string; AnAsProto: Boolean);
+begin
+  inherited SaveDataToXMLConfig(AConfig, APath, AnAsProto);
+  AConfig.SetDeleteValue(APath + 'Addr', Int64(FAddress), 0);
+end;
+
 { TWatchResultValueWideString }
 
 function TWatchResultValueWideString.GetAsString: String;
@@ -3288,6 +3318,16 @@ begin
   Result := wdString;
 end;
 
+function TWatchResultDataString.GetHasDataAddress: Boolean;
+begin
+  Result := True;
+end;
+
+function TWatchResultDataString.GetDataAddress: TDBGPtr;
+begin
+  Result := FData.GetDataAddress;
+end;
+
 constructor TWatchResultDataString.Create(AStringVal: String);
 begin
   inherited Create;

ide/packages/idedebugger/idedebuggerwatchresultjson.pas

@@ -12,7 +12,7 @@ type
 
   { TWatchResultDataJSonBase }
 
-  TWatchResultDataJSonBase = class(TWatchResultDataPrePrinted)
+  TWatchResultDataJSonBase = class(TWatchResultDataString)
   private
     FInternalJSon: TJSONData;
     FIndex: Integer;