@ -1,6 +1,8 @@
{{ $ file : = .file }}
{{ range $ j , $ section : = $ file .Sections }}
{{ range $ k , $ line : = $ section .Lines }}
{{ $ hasmatch : = ne $ line .Match - 1 }}
{{ if or ( ne .GetType 2 ) ( not $ hasmatch ) }}
<tr class=" {{ DiffLineTypeToStr .GetType }} -code nl- {{ $ k }} ol- {{ $ k }} " data-line-type=" {{ DiffLineTypeToStr .GetType }} ">
{{ if eq .GetType 4 }}
<td class="lines-num lines-num-old">
@ -21,6 +23,14 @@
{{ end }}
</td>
<td colspan="5" class="lines-code lines-code-old "><code class="code-inner"> {{ $ section .GetComputedInlineDiffFor $ line }} </span></td>
{{ else if and ( eq .GetType 3 ) $ hasmatch }} {{ / * DEL * / }}
{{ $ match : = in dex $ section .Lines $ line .Match }}
<td class="lines-num lines-num-old del-code" data-line-num=" {{ $ line .LeftIdx }} "><span rel="diff- {{ Sha1 $ file .Name }} L {{ $ line .LeftIdx }} "></span></td>
<td class="lines-type-marker lines-type-marker-old del-code"><span class="mono" data-type-marker=" {{ $ line .GetLineTypeMarker }} "></span></td>
<td class="lines-code lines-code-old halfwidth del-code"> {{ if and $ .root .SignedUserID $ .root .PageIsPullFiles }} <a class="ui primary button add-code-comment add-code-comment-left {{ if ( not $ line .CanComment ) }} invisible {{ end }} " data-path=" {{ $ file .Name }} " data-side="left" data-idx=" {{ $ line .LeftIdx }} " data-new-comment-url=" {{ $ .root .Issue .HTMLURL }} /files/reviews/new_comment"> {{ svg "octicon-plus" }} </a> {{ end }} <code class="code-inner"> {{ if $ line .LeftIdx }} {{ $ section .GetComputedInlineDiffFor $ line }} {{ end }} </code></td>
<td class="lines-num lines-num-new add-code" data-line-num=" {{ if $ match .RightIdx }} {{ $ match .RightIdx }} {{ end }} "><span rel=" {{ if $ match .RightIdx }} diff- {{ Sha1 $ file .Name }} R {{ $ match .RightIdx }} {{ end }} "></span></td>
<td class="lines-type-marker lines-type-marker-new add-code"> {{ if $ match .RightIdx }} <span class="mono" data-type-marker=" {{ $ match .GetLineTypeMarker }} "></span> {{ end }} </td>
<td class="lines-code lines-code-new halfwidth add-code"> {{ if and $ .root .SignedUserID $ .root .PageIsPullFiles }} <a class="ui primary button add-code-comment add-code-comment-right {{ if ( not $ match .CanComment ) }} invisible {{ end }} " data-path=" {{ $ file .Name }} " data-side="right" data-idx=" {{ $ match .RightIdx }} " data-new-comment-url=" {{ $ .root .Issue .HTMLURL }} /files/reviews/new_comment"> {{ svg "octicon-plus" }} </a> {{ end }} <code class="code-inner"> {{ if $ match .RightIdx }} {{ $ section .GetComputedInlineDiffFor $ match }} {{ end }} </code></td>
{{ else }}
<td class="lines-num lines-num-old" data-line-num=" {{ if $ line .LeftIdx }} {{ $ line .LeftIdx }} {{ end }} "><span rel=" {{ if $ line .LeftIdx }} diff- {{ Sha1 $ file .Name }} L {{ $ line .LeftIdx }} {{ end }} "></span></td>
<td class="lines-type-marker lines-type-marker-old"> {{ if $ line .LeftIdx }} <span class="mono" data-type-marker=" {{ $ line .GetLineTypeMarker }} "></span> {{ end }} </td>
@ -30,14 +40,48 @@
<td class="lines-code lines-code-new halfwidth"> {{ if and $ .root .SignedUserID $ .root .PageIsPullFiles ( not ( eq .GetType 3 ) ) }} <a class="ui primary button add-code-comment add-code-comment-right {{ if ( not $ line .CanComment ) }} invisible {{ end }} " data-path=" {{ $ file .Name }} " data-side="right" data-idx=" {{ $ line .RightIdx }} " data-new-comment-url=" {{ $ .root .Issue .HTMLURL }} /files/reviews/new_comment"> {{ svg "octicon-plus" }} </a> {{ end }} <code class="code-inner"> {{ if $ line .RightIdx }} {{ $ section .GetComputedInlineDiffFor $ line }} {{ end }} </code></td>
{{ end }}
</tr>
{{ if and ( eq .GetType 3 ) $ hasmatch }}
{{ $ match : = in dex $ section .Lines $ line .Match }}
{{ if or ( gt ( len $ line .Comments ) 0 ) ( gt ( len $ match .Comments ) 0 ) }}
<tr class="add-comment" data-line-type=" {{ DiffLineTypeToStr .GetType }} ">
<td class="lines-num"></td>
<td class="lines-type-marker"></td>
<td class="add-comment-left">
{{ if gt ( len $ line .Comments ) 0 }}
{{ if eq $ line .GetCommentSide "previous" }}
{{ template "repo/diff/conversation" mergeinto $ .root "comments" $ line .Comments }}
{{ end }}
{{ end }}
{{ if gt ( len $ match .Comments ) 0 }}
{{ if eq $ match .GetCommentSide "previous" }}
{{ template "repo/diff/conversation" mergeinto $ .root "comments" $ match .Comments }}
{{ end }}
{{ end }}
</td>
<td class="lines-num"></td>
<td class="lines-type-marker"></td>
<td class="add-comment-right">
{{ if eq $ line .GetCommentSide "proposed" }}
{{ template "repo/diff/conversation" mergeinto $ .root "comments" $ line .Comments }}
{{ end }}
{{ if gt ( len $ match .Comments ) 0 }}
{{ if eq $ match .GetCommentSide "proposed" }}
{{ template "repo/diff/conversation" mergeinto $ .root "comments" $ match .Comments }}
{{ end }}
{{ end }}
</td>
</tr>
{{ end }}
{{ else if gt ( len $ line .Comments ) 0 }}
<tr class="add-comment" data-line-type=" {{ DiffLineTypeToStr .GetType }} ">
<td class="lines-num"></td>
<td class="lines-type-marker"></td>
<td class="add-comment-left">
{{ if gt ( len $ line .Comments ) 0 }}
{{ if eq $ line .GetCommentSide "previous" }}
{{ template "repo/diff/conversation" mergeinto $ .root "comments" $ line .Comments }}
{{ end }}
{{ end }}
</td>
<td class="lines-num"></td>
<td class="lines-type-marker"></td>
@ -49,4 +93,5 @@
</tr>
{{ end }}
{{ end }}
{{ end }}
{{ end }}