update truncation and display

Author: bxngyn

check50/_api.py

@@ -455,7 +455,18 @@ class Mismatch(Failure):
     """
 
     def __init__(self, expected, actual, help=None):
-        super().__init__(rationale=_("expected {}, not {}").format(_raw(expected), _raw(actual)), help=help)
+        expected, actual = _truncate(expected, actual), _truncate(actual, expected)
+
+        # rationale = _("expected {}, not {}").format(
+        #     _raw(expected),
+        #     _raw(actual)
+        # )
+        rationale = _("expected: {}\n    actual:   {}").format(
+            _raw(expected),
+            _raw(actual)
+        )
+
+        super().__init__(rationale=rationale, help=help)
 
         if expected == EOF:
             expected = "EOF"
@@ -495,6 +506,30 @@ def wrapper(*args, **kwargs):
         return wrapper
     return decorator
 
+def _truncate(s, other, max_len=10):
+    """Truncate string s around its first difference with other"""
+
+    # find the index of first difference
+    limit = min(len(s), len(other))
+    i = limit
+    for index in range(limit):
+        if s[index] != other[index]:
+            i = index
+            break
+
+    # center around diff
+    start = max(i - (max_len // 2), 0)
+    end = min(start + max_len, len(s))
+
+    snippet = s[start:end]
+
+    if start > 0:
+        snippet = "..." + snippet
+    if end < len(s):
+        snippet = snippet + "..."
+
+    return snippet
+
 
 def _raw(s):
     """Get raw representation of s, truncating if too long."""
@@ -506,8 +541,7 @@ def _raw(s):
         return "EOF"
 
     s = f'"{repr(str(s))[1:-1]}"'
-    # if len(s) > 15:
-    #     s = s[:15] + "...\""  # Truncate if too long
+
     return s
 
 

check50/renderer/_renderers.py

@@ -8,7 +8,6 @@
 
 TEMPLATES = pathlib.Path(files("check50.renderer").joinpath("templates"))
 
-
 def to_html(slug, results, version):
     with open(TEMPLATES / "results.html") as f:
         content = f.read()

check50/renderer/templates/results.html

@@ -75,20 +75,37 @@ <h3 style="color:orange">:| {{ check.description }}</h3>
                           {% if check.cause and "actual" in check.cause and "expected" in check.cause %}
                               <br/>
                               <div class="row">
-                                  {% set expected = check.cause.expected | join('\n') if check.cause.expected is not string else check.cause.expected %}
                                   <div class="col-md-6">
                                       <b>Expected Output:</b>
-                                      <pre style="background-color:black; color:white; padding:10px;">
-                                          {{ expected }}
-                                      </pre>
+                                      <br/>
+                                      <div style="background-color:black; color:white;">
+                                      <samp>
+                                          {% autoescape false %}
+                                              {% if check.cause.expected is not string %}
+                                                  {% set expected = check.cause.expected | join('\n') | e %}
+                                              {% else %}
+                                                  {% set expected = check.cause.expected | e %}
+                                              {% endif %}
+                                              {{ expected | replace(" ", "&nbsp;") | replace("\n", "<br/>") }}
+                                          {% endautoescape %}
+                                      </samp>
+                                      </div>
                                   </div>
-                                  
-                                  {% set actual = check.cause.actual | join('\n') if check.cause.actual is not string else check.cause.actual %}
                                   <div class="col-md-6">
                                       <b>Actual Output:</b>
-                                      <pre style="background-color:black; color:white; padding:10px;">
-                                          {{ actual }}
-                                      </pre>
+                                      <br/>
+                                      <div style="background-color:black; color:white;">
+                                      <samp>
+                                          {% autoescape false %}
+                                              {% if check.cause.actual is not string %}
+                                                  {% set actual = check.cause.actual | join('\n') | e %}
+                                              {% else %}
+                                                  {% set actual = check.cause.actual | e %}
+                                              {% endif %}
+                                              {{ actual | replace(" ", "&nbsp;") | replace("\n", "<br/>") }}
+                                          {% endautoescape %}
+                                      </samp>
+                                      </div>
                                   </div>
                               </div>
                           {% endif %}