Show diffhunk headers and fine-grained "show more" buttons (#180)

* thread through hunk header

* update codediff.js

* fix tests

Author: danvk

tests/unified_diff_test.py

@@ -102,7 +102,7 @@ def test_read_codes_delete():
 def test_read_codes_skip():
     codes = read_codes(PatchSet.from_string(skip_insert_hunk))
     assert codes == [
-        Code(type='skip', before=(0, 2), after=(0, 2)),
+        Code(type='skip', before=(0, 2), after=(0, 2), header='pytest==7.1.3'),
         Code(type='equal', before=(2, 5), after=(2, 5)),
         Code(type='insert', before=(5, 5), after=(5, 6)),
         Code(type='equal', before=(5, 6), after=(6, 7)),

ts/CodeDiff.tsx

@@ -104,6 +104,7 @@ export function CodeDiff(props: {filePair: FilePair, diffOptions: Partial<DiffOp
       }
     })().catch(e => {
       alert('Unable to get diff!');
+      console.error(e);
     });
   }, [filePair, diffOptions]);
 

webdiff/static/codediff.js/codediff.css

@@ -17,7 +17,14 @@ td.code {
   /* for table cells, `width` behaves more like `max-width`. */
   width: 61ch;
   white-space: pre-wrap;
-  overflow-wrap: anywhere;
+  word-wrap: break-word;
+}
+
+table.diff td.code {
+  word-break: break-all;
+}
+table.diff.word-wrap td.code {
+  word-break: normal;
 }
 
 table.diff td {
@@ -32,12 +39,12 @@ table.diff td {
 .line-no:first-child {
   background-image:
       linear-gradient(to left, #f7f7f7, #f7f7f7 3px, transparent, transparent 6px, #f7f7f7 6px),
-      linear-gradient(#f7f7f7, #f7f7f7 1.4em, #aaa 1.4em);
+      linear-gradient(#f7f7f7, #f7f7f7 1.5em, #aaa 1.5em);
 }
 .line-no:last-child {
   background-image:
       linear-gradient(to right, #f7f7f7, #f7f7f7 3px, transparent, transparent 6px, #f7f7f7 6px),
-      linear-gradient(#f7f7f7, #f7f7f7 1.4em, #aaa 1.4em);
+      linear-gradient(#f7f7f7, #f7f7f7 1.5em, #aaa 1.5em);
 }
 
 table.diff .line-no:first-child {
@@ -51,6 +58,13 @@ table.diff .line-no:last-child {
 table.diff td:nth-child(2) {
   border-right: 1px solid #ddd;
 }
+table.diff tr.skip-row td {
+  border-left: none;
+  border-right: none;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
+  padding: 0.5em;
+}
 
 .line-no, .code {
   padding: 2px;
@@ -59,20 +73,31 @@ table.diff td:nth-child(2) {
 }
 .diff .skip {
   text-align: center;
-  background: #f7f7f7;
+  background: white;
+  color: #999;
+}
+.arrows-left {
+  float: left;
+}
+.arrows-right {
+  float: right;
+}
+.expand-up + .expand-down {
+  margin-left: 0.25em;
 }
 
-.diff .delete {
-  background-color: #fee;
+.hunk-header {
+  margin-left: 2em;
+  color: #777;
 }
-.diff .insert {
-  background-color: #efe;
+span.skip {
+  cursor: pointer;
 }
 
-.before.replace {
+.diff .delete, .before.replace {
   background-color: #fee;
 }
-.after.replace {
+.diff .insert, .after.replace {
   background-color: #efe;
 }