Fix array bugs

Author: mauvilsa

deepdiff/colored_view.py

@@ -4,6 +4,9 @@
 from importlib.util import find_spec
 from typing import Any, Dict
 
+from deepdiff.model import TextResult, TreeResult
+
+
 if os.name == "nt" and find_spec("colorama"):
     import colorama
 
@@ -19,30 +22,31 @@
 class ColoredView:
     """A view that shows JSON with color-coded differences."""
 
-    def __init__(self, t2, tree_results, verbose_level=1, compact=False):
+    def __init__(self, t2: Any, tree_result: TreeResult, compact: bool = False):
         self.t2 = t2
-        self.tree = tree_results
-        self.verbose_level = verbose_level
+        self.tree = tree_result
         self.compact = compact
         self.diff_paths = self._collect_diff_paths()
 
     def _collect_diff_paths(self) -> Dict[str, str]:
         """Collect all paths that have differences and their types."""
+        text_result = TextResult(tree_results=self.tree, verbose_level=2)
         diff_paths = {}
-        for diff_type, items in self.tree.items():
+        for diff_type, items in text_result.items():
+            if not items:
+                continue
             try:
-                iterator = iter(items)
+                iter(items)
             except TypeError:
                 continue
-            for item in items:
-                if type(item).__name__ == "DiffLevel":
-                    path = item.path()
-                    if diff_type in ('values_changed', 'type_changes'):
-                        diff_paths[path] = ('changed', item.t1, item.t2)
-                    elif diff_type in ('dictionary_item_added', 'iterable_item_added', 'set_item_added'):
-                        diff_paths[path] = ('added', None, item.t2)
-                    elif diff_type in ('dictionary_item_removed', 'iterable_item_removed', 'set_item_removed'):
-                        diff_paths[path] = ('removed', item.t1, None)
+            for path, item in items.items():
+                if diff_type in ("values_changed", "type_changes"):
+                    changed_path = item.get("new_path") or path
+                    diff_paths[changed_path] = ("changed", item["old_value"], item["new_value"])
+                elif diff_type in ("dictionary_item_added", "iterable_item_added", "set_item_added"):
+                    diff_paths[path] = ("added", None, item)
+                elif diff_type in ("dictionary_item_removed", "iterable_item_removed", "set_item_removed"):
+                    diff_paths[path] = ("removed", item, None)
         return diff_paths
 
     def _format_value(self, value: Any) -> str:
@@ -112,14 +116,13 @@ def _colorize_json(self, obj: Any, path: str = 'root', indent: int = 0) -> str:
                 self._colorize_skip_paths.add(f"{path}[{index}]")
 
             items = []
-            index = 0
-            for value in obj:
-                new_path = f"{path}[{index}]"
-                while index == next(iter(removed_map), None):
-                    items.append(f'{next_indent}{RED}{self._format_value(removed_map.pop(index))}{RESET}')
-                    index += 1
-                items.append(f'{next_indent}{self._colorize_json(value, new_path, indent + 1)}')
-                index += 1
+            remove_index = 0
+            for index, value in enumerate(obj):
+                while remove_index == next(iter(removed_map), None):
+                    items.append(f'{next_indent}{RED}{self._format_value(removed_map.pop(remove_index))}{RESET}')
+                    remove_index += 1
+                items.append(f'{next_indent}{self._colorize_json(value, f"{path}[{index}]", indent + 1)}')
+                remove_index += 1
             for value in removed_map.values():
                 items.append(f'{next_indent}{RED}{self._format_value(value)}{RESET}')
             return '[\n' + ',\n'.join(items) + f'\n{current_indent}' + ']'

deepdiff/commands.py

@@ -54,7 +54,7 @@ def cli():
 @click.option('--significant-digits', required=False, default=None, type=int, show_default=True)
 @click.option('--truncate-datetime', required=False, type=click.Choice(['second', 'minute', 'hour', 'day'], case_sensitive=True), show_default=True, default=None)
 @click.option('--verbose-level', required=False, default=1, type=click.IntRange(0, 2), show_default=True)
-@click.option('--view', required=False, type=click.Choice(['tree', 'colored', 'colored_compact'], case_sensitive=True))
+@click.option('--view', required=False, type=click.Choice(['tree', 'colored', 'colored_compact'], case_sensitive=True), show_default=True, default='tree')
 @click.option('--debug', is_flag=True, show_default=False)
 def diff(
     *args, **kwargs

deepdiff/diff.py

@@ -1766,9 +1766,9 @@ def _get_view_results(self, view):
         elif view == DELTA_VIEW:
             result = self._to_delta_dict(report_repetition_required=False)
         elif view == COLORED_VIEW:
-            result = ColoredView(self.t2, tree_results=result, verbose_level=self.verbose_level)
+            result = ColoredView(t2=self.t2, tree_result=self.tree, compact=False)
         elif view == COLORED_COMPACT_VIEW:
-            result = ColoredView(self.t2, tree_results=result, verbose_level=self.verbose_level, compact=True)
+            result = ColoredView(t2=self.t2, tree_result=self.tree, compact=True)
         else:
             raise ValueError(INVALID_VIEW_MSG.format(view))
         return result

tests/test_colored_view.py

@@ -183,6 +183,36 @@ def test_colored_view_list_no_changes_with_ignore_order():
     assert result == expected
 
 
+def test_colored_view_list_with_ignore_order():
+    t1 = {
+        "hobbies": [
+            "reading",
+            "hiking"
+        ]
+    }
+
+    t2 = {
+        "hobbies": [
+            "hiking",
+            "painting",
+            "coding"
+        ]
+    }
+
+    diff = DeepDiff(t1, t2, view=COLORED_VIEW, ignore_order=True)
+    result = str(diff)
+
+    expected = f'''{{
+  "hobbies": [
+    {RED}"reading"{RESET},
+    "hiking",
+    {GREEN}"painting"{RESET},
+    {GREEN}"coding"{RESET}
+  ]
+}}'''
+    assert result == expected
+
+
 def test_colored_view_no_changes():
     t1 = {"a": 1, "b": 2}
     t2 = {"a": 1, "b": 2}