From 3a513ac6bd5957c973ba838a8680d3c6cb688fa8 Mon Sep 17 00:00:00 2001
From: JamieC2002 <jamiech2002@gmail.com>
Date: Thu, 7 Dec 2023 18:53:10 -0500
Subject: [PATCH] Added conditional to check if left or right is an empty list.
 Added modifications to the formatting to fix strings that were created with
 implicit string concatenation.

---
 src/_pytest/assertion/util.py       | 35 +++++++++++++++++++++++++++--
 testing/examples/test_issue10863.py |  6 -----
 2 files changed, 33 insertions(+), 8 deletions(-)
 delete mode 100644 testing/examples/test_issue10863.py

diff --git a/src/_pytest/assertion/util.py b/src/_pytest/assertion/util.py
index 4d9fd114b..4669278e6 100644
--- a/src/_pytest/assertion/util.py
+++ b/src/_pytest/assertion/util.py
@@ -12,6 +12,7 @@ from typing import Mapping
 from typing import Optional
 from typing import Protocol
 from typing import Sequence
+from typing import Tuple
 from unicodedata import normalize
 
 import _pytest._code
@@ -341,12 +342,16 @@ def _compare_eq_iterable(
     # dynamic import to speedup pytest
     import difflib
 
-    left_formatting = pprint.pformat(left).splitlines()
-    right_formatting = pprint.pformat(right).splitlines()
+    if _is_empty_vs_non_empty(left, right):
+        left_formatting, right_formatting = _format_for_empty_and_non_empty(left, right)
+    else:
+        left_formatting = pprint.pformat(left).splitlines()
+        right_formatting = pprint.pformat(right).splitlines()
 
     # Re-format for different output lengths.
     lines_left = len(left_formatting)
     lines_right = len(right_formatting)
+
     if lines_left != lines_right:
         printer = PrettyPrinter()
         left_formatting = printer.pformat(left).splitlines()
@@ -371,6 +376,32 @@ def _compare_eq_iterable(
     return explanation
 
 
+def _is_empty_vs_non_empty(left: Iterable[Any], right: Iterable[Any]) -> bool:
+    is_left_empty = not any(left) if isinstance(left, Iterable) else not left
+    is_right_empty = not any(right) if isinstance(right, Iterable) else not right
+    return (is_left_empty and not is_right_empty) or (
+        not is_left_empty and is_right_empty
+    )
+
+
+def _format_for_empty_and_non_empty(
+    left: Iterable[Any], right: Iterable[Any]
+) -> Tuple[List[str], List[str]]:
+    if isinstance(left, (list, tuple)) and isinstance(right, (list, tuple)):
+        if not left:
+            right_width = len(right[0]) + 4 if right else 80
+            right_formatting = pprint.pformat(right, width=right_width).splitlines()
+            left_formatting = pprint.pformat(left).splitlines()
+        else:
+            left_width = len(left[0]) + 4 if left else 80
+            left_formatting = pprint.pformat(left, width=left_width).splitlines()
+            right_formatting = pprint.pformat(right).splitlines()
+        return left_formatting, right_formatting
+    else:
+        # Fall back to default formatting
+        return pprint.pformat(left).splitlines(), pprint.pformat(right).splitlines()
+
+
 def _compare_eq_sequence(
     left: Sequence[Any], right: Sequence[Any], verbose: int = 0
 ) -> List[str]:
diff --git a/testing/examples/test_issue10863.py b/testing/examples/test_issue10863.py
deleted file mode 100644
index 337e8fa9c..000000000
--- a/testing/examples/test_issue10863.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def test_():
-    m = [
-        "This is some dummy test which shows the strange way in which Pycharm"
-        " displays the full diff."
-    ]
-    assert m == []
\ No newline at end of file