From 73bbf378405fa5ee0ddcce450fdc9d7ce28b987e Mon Sep 17 00:00:00 2001
From: Martin <laz.git@mfriebe.de>
Date: Tue, 21 Mar 2023 18:29:18 +0100
Subject: [PATCH] Debugger, IDE: clear new lines for errors, and status text.
 Related to 5f0317b72ed4d88174d94193a82f90d39357fb23

---
 ide/packages/idedebugger/idedebuggerwatchresprinter.pas | 4 ++++
 ide/packages/idedebugger/localsdlg.pp                   | 2 +-
 ide/packages/idedebugger/watchesdlg.pp                  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ide/packages/idedebugger/idedebuggerwatchresprinter.pas b/ide/packages/idedebugger/idedebuggerwatchresprinter.pas
index 24c959b6f2..30daac31cf 100644
--- a/ide/packages/idedebugger/idedebuggerwatchresprinter.pas
+++ b/ide/packages/idedebugger/idedebuggerwatchresprinter.pas
@@ -385,7 +385,11 @@ begin
   Result := '';
   case AResValue.ValueKind of
     rdkError:
+      begin
       Result := 'Error: ' + AResValue.AsString;
+      if rpfClearMultiLine in FFormatFlags then
+        Result := ClearMultiline(Result);
+    end;
     rdkUnknown:
       Result := 'Error: Unknown';
     rdkPrePrinted: begin
diff --git a/ide/packages/idedebugger/localsdlg.pp b/ide/packages/idedebugger/localsdlg.pp
index e2593b061f..6a97ce5de9 100644
--- a/ide/packages/idedebugger/localsdlg.pp
+++ b/ide/packages/idedebugger/localsdlg.pp
@@ -844,7 +844,7 @@ var
 begin
   ResData :=  AWatchAbleResult.ResultData;
   if ResData = nil then
-    s := AWatchAbleResult.Value
+    s := ClearMultiline(AWatchAbleResult.Value)
   else
     s := FLocalsDlg.FWatchPrinter.PrintWatchValue(ResData, wdfDefault);
   TreeView.NodeText[AVNode, 0] := TIdeLocalsValue(AWatchAble).DisplayName;
diff --git a/ide/packages/idedebugger/watchesdlg.pp b/ide/packages/idedebugger/watchesdlg.pp
index 68eb60a0c6..631c19c02a 100644
--- a/ide/packages/idedebugger/watchesdlg.pp
+++ b/ide/packages/idedebugger/watchesdlg.pp
@@ -1383,7 +1383,7 @@ begin
            (AWatchAbleResult.TypeInfo.Attributes * [saArray, saDynArray] <> []) and
            (AWatchAbleResult.TypeInfo.Len >= 0)
         then TreeView.NodeText[AVNode, COL_WATCH_VALUE-1] := Format(drsLen, [AWatchAbleResult.TypeInfo.Len]) + AWatchAbleResult.Value
-        else TreeView.NodeText[AVNode, COL_WATCH_VALUE-1] := AWatchAbleResult.Value;
+        else TreeView.NodeText[AVNode, COL_WATCH_VALUE-1] := ClearMultiline(AWatchAbleResult.Value);
       end;
     end
     else