Skip to content

Add wrapped side-by-side renderer #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add wrapped side-by-side renderer #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67bcaaf
templates: add colspan to block headers
hayatogh Aug 9, 2025
8918e57
renderer: add wrapped side-by-side renderer
hayatogh Aug 9, 2025
e7f827e
tests: add tests for wrapped side-by-side renderer
hayatogh Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/__tests__/diff2html-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -281,7 +281,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -358,7 +358,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -416,7 +416,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand All @@ -440,7 +440,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">&nbsp;</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -487,7 +487,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand All @@ -511,7 +511,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">&nbsp;</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -578,7 +578,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand All @@ -602,7 +602,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">&nbsp;</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -671,7 +671,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1,7 +1,6 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -754,7 +754,7 @@ describe('Diff2Html', () => {
</tr>
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -11,7 +10,7 @@ $a=&amp;quot;&amp;lt;table&amp;gt;&amp;lt;tr&amp;gt;&amp;lt;td&amp;gt;- 1.1.9: Fix around ubuntu&amp;#x27;s inability to cache promises. [#8</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -917,7 +917,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1,2 +1,2 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -1024,7 +1024,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1,5 +1,5 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -1107,7 +1107,7 @@ describe('Diff2Html', () => {
</tr>
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -24,12 +24,7 @@ $(function() {</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -1290,7 +1290,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -1370,7 +1370,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -1432,7 +1432,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -1512,7 +1512,7 @@ describe('Diff2Html', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/hogan-cache-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('HoganJsUtils', () => {
});
expect(result).toMatchInlineSnapshot(`
"<tr>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">
File without changes
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/__tests__/line-by-line-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('LineByLineRenderer', () => {
const fileHtml = lineByLineRenderer.generateEmptyDiff();
expect(fileHtml).toMatchInlineSnapshot(`
"<tr>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">
File without changes
</div>
Expand Down Expand Up @@ -468,7 +468,7 @@ describe('LineByLineRenderer', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -541,7 +541,7 @@ describe('LineByLineRenderer', () => {
<table class="d2h-diff-table">
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">
File without changes
</div>
Expand Down Expand Up @@ -602,7 +602,7 @@ describe('LineByLineRenderer', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line"><a href="http://example.com">Custom link to render</a></div>
</td>
</tr>
Expand Down Expand Up @@ -671,7 +671,7 @@ describe('LineByLineRenderer', () => {
expect(html).toMatchInlineSnapshot(`
"<tr>
<td class="d2h-code-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand Down
16 changes: 8 additions & 8 deletions src/__tests__/side-by-side-printer-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('SideBySideRenderer', () => {
expect(fileHtml).toMatchInlineSnapshot(`
{
"left": "<tr>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">
File without changes
</div>
Expand Down Expand Up @@ -81,7 +81,7 @@ describe('SideBySideRenderer', () => {
{
"left": "<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">@@ -19,7 +19,7 @@</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -117,7 +117,7 @@ describe('SideBySideRenderer', () => {
</tr>",
"right": "<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">&nbsp;</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -298,7 +298,7 @@ describe('SideBySideRenderer', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">@@ -1 +1 @@</div>
</td>
</tr><tr>
Expand All @@ -322,7 +322,7 @@ describe('SideBySideRenderer', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">&nbsp;</div>
</td>
</tr><tr>
Expand Down Expand Up @@ -382,7 +382,7 @@ describe('SideBySideRenderer', () => {
<table class="d2h-diff-table">
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">
File without changes
</div>
Expand Down Expand Up @@ -454,7 +454,7 @@ describe('SideBySideRenderer', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line"><a href="http://example.com">Custom link to render</a></div>
</td>
</tr>
Expand All @@ -468,7 +468,7 @@ describe('SideBySideRenderer', () => {
<tbody class="d2h-diff-tbody">
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<td colspan="" class="d2h-info">
<div class="d2h-code-side-line">&nbsp;</div>
</td>
</tr>
Expand Down
Loading