luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Allow selection of empty lines

Browse source
This commit is contained in:
Rodrigo Fernandes 2020-02-09 17:02:44 +00:00
parent 4a3ed66135
commit 7be6ef0f4d
No known key found for this signature in database
GPG key ID: 67157D2E3D4258B4
2 changed files with 210 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/__tests__/diff2html-tests.ts
View file

@ -624,7 +624,7 @@ describe('Diff2Html', () => {
' \n'; ' \n';
const result = html(diffExample2, { drawFileList: false }); const result = html(diffExample2, { drawFileList: false });
expect(result).toMatchInlineSnapshot(` expect(result).toMatchInlineSnapshot(`
"<div class=\\"d2h-wrapper\\"> "<div class=\\"d2h-wrapper\\">
<div id=\\"d2h-211439\\" class=\\"d2h-file-wrapper\\" data-lang=\\"md\\"> <div id=\\"d2h-211439\\" class=\\"d2h-file-wrapper\\" data-lang=\\"md\\">
<div class=\\"d2h-file-header\\"> <div class=\\"d2h-file-header\\">
<span class=\\"d2h-file-name-wrapper\\"> <span class=\\"d2h-file-name-wrapper\\">
@ -642,10 +642,10 @@ describe('Diff2Html', () => {
<td class=\\"d2h-info\\"> <td class=\\"d2h-info\\">
<div class=\\"d2h-code-line d2h-info\\">@@ -1,7 +1,6 @@</div> <div class=\\"d2h-code-line d2h-info\\">@@ -1,7 +1,6 @@</div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">1</div> <div class=\\"line-num1\\">1</div>
<div class=\\"line-num2\\">1</div> <div class=\\"line-num2\\">1</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -653,10 +653,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\"># Change Log</span> <span class=\\"d2h-code-line-ctn\\"># Change Log</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">2</div> <div class=\\"line-num1\\">2</div>
<div class=\\"line-num2\\">2</div> <div class=\\"line-num2\\">2</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -664,10 +664,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">All notable changes to this project will be documented in this file.</span> <span class=\\"d2h-code-line-ctn\\">All notable changes to this project will be documented in this file.</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">3</div> <div class=\\"line-num1\\">3</div>
<div class=\\"line-num2\\">3</div> <div class=\\"line-num2\\">3</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -675,10 +675,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">This project adheres to [Semantic Versioning](http:&#x2F;&#x2F;semver.org&#x2F;).</span> <span class=\\"d2h-code-line-ctn\\">This project adheres to [Semantic Versioning](http:&#x2F;&#x2F;semver.org&#x2F;).</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-del\\"> <td class=\\"d2h-code-linenumber d2h-del\\">
<div class=\\"line-num1\\">4</div> <div class=\\"line-num1\\">4</div>
<div class=\\"line-num2\\"></div> <div class=\\"line-num2\\"></div>
</td> </td>
<td class=\\"d2h-del\\"> <td class=\\"d2h-del\\">
<div class=\\"d2h-code-line d2h-del\\"> <div class=\\"d2h-code-line d2h-del\\">
@ -686,10 +686,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Use the following format for additions: \` - VERSION: [feature&#x2F;patch (if applicable)] Short description of change. Links to relevant issues&#x2F;PRs.\`</span> <span class=\\"d2h-code-line-ctn\\">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Use the following format for additions: \` - VERSION: [feature&#x2F;patch (if applicable)] Short description of change. Links to relevant issues&#x2F;PRs.\`</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">5</div> <div class=\\"line-num1\\">5</div>
<div class=\\"line-num2\\">4</div> <div class=\\"line-num2\\">4</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -697,10 +697,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;</span> <span class=\\"d2h-code-line-ctn\\">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">6</div> <div class=\\"line-num1\\">6</div>
<div class=\\"line-num2\\">5</div> <div class=\\"line-num2\\">5</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -708,10 +708,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;- 1.1.9: Fix around ubuntu&#x27;s inability to cache promises. [#877](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;878)</span> <span class=\\"d2h-code-line-ctn\\">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;- 1.1.9: Fix around ubuntu&#x27;s inability to cache promises. [#877](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;878)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">7</div> <div class=\\"line-num1\\">7</div>
<div class=\\"line-num2\\">6</div> <div class=\\"line-num2\\">6</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -719,16 +719,16 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">- 1.1.8:</span> <span class=\\"d2h-code-line-ctn\\">- 1.1.8:</span>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class=\\"d2h-code-linenumber d2h-info\\"></td> <td class=\\"d2h-code-linenumber d2h-info\\"></td>
<td class=\\"d2h-info\\"> <td class=\\"d2h-info\\">
<div class=\\"d2h-code-line d2h-info\\">@@ -11,7 +10,7 @@ $a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;- 1.1.9: Fix around ubuntu&#x27;s inability to cache promises. [#8</div> <div class=\\"d2h-code-line d2h-info\\">@@ -11,7 +10,7 @@ $a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;- 1.1.9: Fix around ubuntu&#x27;s inability to cache promises. [#8</div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">11</div> <div class=\\"line-num1\\">11</div>
<div class=\\"line-num2\\">10</div> <div class=\\"line-num2\\">10</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -736,10 +736,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">- 1.1.7:</span> <span class=\\"d2h-code-line-ctn\\">- 1.1.7:</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">12</div> <div class=\\"line-num1\\">12</div>
<div class=\\"line-num2\\">11</div> <div class=\\"line-num2\\">11</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -747,10 +747,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\"> - Fix diff flickering issue and optimization [#865](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;865)</span> <span class=\\"d2h-code-line-ctn\\"> - Fix diff flickering issue and optimization [#865](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;865)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">13</div> <div class=\\"line-num1\\">13</div>
<div class=\\"line-num2\\">12</div> <div class=\\"line-num2\\">12</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -758,10 +758,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\"> - Fix credential dialog issue [#864](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;864)</span> <span class=\\"d2h-code-line-ctn\\"> - Fix credential dialog issue [#864](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;864)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-del d2h-change\\"> <td class=\\"d2h-code-linenumber d2h-del d2h-change\\">
<div class=\\"line-num1\\">14</div> <div class=\\"line-num1\\">14</div>
<div class=\\"line-num2\\"></div> <div class=\\"line-num2\\"></div>
</td> </td>
<td class=\\"d2h-del d2h-change\\"> <td class=\\"d2h-del d2h-change\\">
<div class=\\"d2h-code-line d2h-del d2h-change\\"> <div class=\\"d2h-code-line d2h-del d2h-change\\">
@ -769,10 +769,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\"> - Fix HEAD branch order when redraw [#858](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;858)</span> <span class=\\"d2h-code-line-ctn\\"> - Fix HEAD branch order when redraw [#858](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;858)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-ins d2h-change\\"> <td class=\\"d2h-code-linenumber d2h-ins d2h-change\\">
<div class=\\"line-num1\\"></div> <div class=\\"line-num1\\"></div>
<div class=\\"line-num2\\">13</div> <div class=\\"line-num2\\">13</div>
</td> </td>
<td class=\\"d2h-ins d2h-change\\"> <td class=\\"d2h-ins d2h-change\\">
<div class=\\"d2h-code-line d2h-ins d2h-change\\"> <div class=\\"d2h-code-line d2h-ins d2h-change\\">
@ -780,10 +780,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\"><ins>4</ins> - Fix HEAD branch order when redraw [#858](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;858)</span> <span class=\\"d2h-code-line-ctn\\"><ins>4</ins> - Fix HEAD branch order when redraw [#858](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;858)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">15</div> <div class=\\"line-num1\\">15</div>
<div class=\\"line-num2\\">14</div> <div class=\\"line-num2\\">14</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -791,10 +791,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">- 1.1.6: Fix path auto complete [#861](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;861)</span> <span class=\\"d2h-code-line-ctn\\">- 1.1.6: Fix path auto complete [#861](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;861)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">16</div> <div class=\\"line-num1\\">16</div>
<div class=\\"line-num2\\">15</div> <div class=\\"line-num2\\">15</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -802,10 +802,10 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">- 1.1.5: Update &quot;Toggle all&quot; button after commit or changing selected files [#859](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;859)</span> <span class=\\"d2h-code-line-ctn\\">- 1.1.5: Update &quot;Toggle all&quot; button after commit or changing selected files [#859](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;859)</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">17</div> <div class=\\"line-num1\\">17</div>
<div class=\\"line-num2\\">16</div> <div class=\\"line-num2\\">16</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
@ -813,24 +813,25 @@ describe('Diff2Html', () => {
<span class=\\"d2h-code-line-ctn\\">- 1.1.4: [patch] Promise refactoring</span> <span class=\\"d2h-code-line-ctn\\">- 1.1.4: [patch] Promise refactoring</span>
</div> </div>
</td> </td>
</tr><tr> </tr><tr>
<td class=\\"d2h-code-linenumber d2h-cntx\\"> <td class=\\"d2h-code-linenumber d2h-cntx\\">
<div class=\\"line-num1\\">18</div> <div class=\\"line-num1\\">18</div>
<div class=\\"line-num2\\">17</div> <div class=\\"line-num2\\">17</div>
</td> </td>
<td class=\\"d2h-cntx\\"> <td class=\\"d2h-cntx\\">
<div class=\\"d2h-code-line d2h-cntx\\"> <div class=\\"d2h-code-line d2h-cntx\\">
<span class=\\"d2h-code-line-prefix\\">&nbsp;</span> <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
<span class=\\"d2h-code-line-ctn\\"><br></span>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div>" </div>"
`); `);
}); });
it('should generate html correctly without escaping twice', () => { it('should generate html correctly without escaping twice', () => {

3
src/templates/generic-line.mustache
View file

@ -10,6 +10,9 @@
{{#content}} {{#content}}
<span class="d2h-code-line-ctn">{{{content}}}</span> <span class="d2h-code-line-ctn">{{{content}}}</span>
{{/content}} {{/content}}
{{^content}}
<span class="d2h-code-line-ctn"><br></span>
{{/content}}
</div> </div>
</td> </td>
</tr> </tr>