Skip to content

html: strip source-cell markup from gap cells #6

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
jvoisin wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −14
Open

html: strip source-cell markup from gap cells #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions samples/arguments.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@
.source-side.remove { --source-background: var(--remove); }
html[data-shared="true"] .source-side.shared { --source-background: var(--shared); }
html[data-shared="false"] .chip.shared { background: var(--header); }
.gap { background: transparent; }
html[data-gaps="false"] .hunk { background-image: none; }
.sign, .number { color: var(--muted); user-select: none; text-align: right; padding-right: 1ch; }
.sign { padding-right: .4ch; color: var(--text); }
Expand Down Expand Up @@ -377,8 +376,8 @@
<p class="legend word-legend">Within aligned pairs: <span class="chip left">left text</span> / <span class="chip right">right text</span> that differs, independently of patch signs. Whitespace uses the same colors: separate space blocks distinguish spaces from tabs; tabs fill their tab stops. Hover for details.</p><div id="comparison"><section id="delta"><div class="section-heading"><h2>Delta differences</h2></div><p class="legend">Code changes that differ between the patches. Old / new are each patch’s parent / result line numbers. Signs belong to that patch. <span class="chip shared">Shared edits</span> are additions or removals both patches make.</p><article class="file-block" id="file-0-0"><h3 class="pair file-heading"><span>record.c</span><span>record.c</span></h3><div class="code-viewport"><div class="hunk"><div class="pair column-headings"><div class="side header-side"><span></span><span class="number">old</span><span class="number">new</span><span></span></div><div class="side header-side"><span></span><span class="number">old</span><span class="number">new</span><span></span></div></div><div class="pair function-pair"><div class="side">static void update_record(struct record *record, int value)</div><div class="side">static void update_record(struct record *record, int value)</div></div>
<div class="pair code-pair" id="row-0"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">1</span><span class="number new" title="Result line number">1</span><span class="source-text">static void update_record(struct record *record, int value)</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">1</span><span class="number new" title="Result line number">1</span><span class="source-text">static void update_record(struct record *record, int value)</span></div></div>
<div class="pair code-pair" id="row-1"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">2</span><span class="number new" title="Result line number">2</span><span class="source-text">{</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">2</span><span class="number new" title="Result line number">2</span><span class="source-text">{</span></div></div>
<div class="pair code-pair" id="row-2"><div class="side source-side gap" data-side="0" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">3</span><span class="number new" title="Result line number">3</span><span class="source-text"> if (!record-&gt;active)</span></div></div>
<div class="pair code-pair" id="row-3"><div class="side source-side gap" data-side="0" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">4</span><span class="number new" title="Result line number">4</span><span class="source-text"> return;</span></div></div>
<div class="pair code-pair" id="row-2"><div class="side gap" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">3</span><span class="number new" title="Result line number">3</span><span class="source-text"> if (!record-&gt;active)</span></div></div>
<div class="pair code-pair" id="row-3"><div class="side gap" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">4</span><span class="number new" title="Result line number">4</span><span class="source-text"> return;</span></div></div>
<div class="pair code-pair" id="row-4" data-change-start><div class="side source-side add" data-side="0" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">3</span><span class="source-text"> write_seqcount_begin(&amp;record-&gt;seq);</span></div><div class="side source-side add" data-side="1" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">5</span><span class="source-text"> write_seqcount_begin(&amp;record-&gt;<span class="word-change" title="Text that differs within this aligned pair."><span class="character-change"><span class="highlight-text">state.</span></span></span>seq);</span></div></div>
<div class="pair code-pair" id="row-5"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">3</span><span class="number new" title="Result line number">4</span><span class="source-text"> record-&gt;value = value;</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number">5</span><span class="number new" title="Result line number">6</span><span class="source-text"> record-&gt;value = value;</span></div></div>
<div class="pair code-pair" id="row-6"><div class="side source-side shared" data-side="0" title="Both patches make this edit; its counterpart may occur at another position." data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">5</span><span class="source-text"> record-&gt;generation++;</span></div><div class="side source-side shared" data-side="1" title="Both patches make this edit; its counterpart may occur at another position." data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">7</span><span class="source-text"> record-&gt;generation++;</span></div></div>
Expand All @@ -389,8 +388,8 @@
<section id="context"><div class="section-heading"><h2>Context differences</h2></div><p class="legend">Surrounding code in the results. Signs mark lines present in only one result: − left, + right.</p><article class="file-block" id="file-1-0"><h3 class="pair file-heading"><span>record.c</span><span>record.c</span></h3><div class="code-viewport"><div class="hunk"><div class="pair column-headings"><div class="side header-side"><span></span><span class="number"></span><span class="number">new</span><span></span></div><div class="side header-side"><span></span><span class="number"></span><span class="number">new</span><span></span></div></div><div class="pair function-pair"><div class="side">static void update_record(struct record *record, int value)</div><div class="side">static void update_record(struct record *record, int value)</div></div>
<div class="pair code-pair" id="row-9"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">1</span><span class="source-text">static void update_record(struct record *record, int value)</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">1</span><span class="source-text">static void update_record(struct record *record, int value)</span></div></div>
<div class="pair code-pair" id="row-10"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">2</span><span class="source-text">{</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">2</span><span class="source-text">{</span></div></div>
<div class="pair code-pair" id="row-11" data-change-start><div class="side source-side gap" data-side="0" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side add" data-side="1" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">3</span><span class="source-text"> if (!record-&gt;active)</span></div></div>
<div class="pair code-pair" id="row-12"><div class="side source-side gap" data-side="0" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side add" data-side="1" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">4</span><span class="source-text"> return;</span></div></div>
<div class="pair code-pair" id="row-11" data-change-start><div class="side gap" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side add" data-side="1" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">3</span><span class="source-text"> if (!record-&gt;active)</span></div></div>
<div class="pair code-pair" id="row-12"><div class="side gap" title="No aligned source line; this is a gap, not a blank source line."></div><div class="side source-side add" data-side="1" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">4</span><span class="source-text"> return;</span></div></div>
<div class="pair code-pair" id="row-13"><div class="side source-side remove" data-side="0" data-newline="yes"><span class="sign">-</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">3</span><span class="source-text"> write_seqcount_begin(&amp;record-&gt;seq);</span></div><div class="side source-side add" data-side="1" data-newline="yes"><span class="sign">+</span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">5</span><span class="source-text"> write_seqcount_begin(&amp;record-&gt;<span class="word-change" title="Text that differs within this aligned pair."><span class="character-change"><span class="highlight-text">state.</span></span></span>seq);</span></div></div>
<div class="pair code-pair" id="row-14"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">4</span><span class="source-text"> record-&gt;value = value;</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">6</span><span class="source-text"> record-&gt;value = value;</span></div></div>
<div class="pair code-pair" id="row-15"><div class="side source-side context" data-side="0" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">5</span><span class="source-text"> record-&gt;generation++;</span></div><div class="side source-side context" data-side="1" data-newline="yes"><span class="sign"> </span><span class="number old" title="Parent line number"></span><span class="number new" title="Result line number">7</span><span class="source-text"> record-&gt;generation++;</span></div></div>
Expand Down
Loading