Skip to content

Commit d9d7c23

Browse files
committed
feat: allow commemting on unchanged lines
Signed-off-by: Divanshu Grover <[email protected]>
1 parent a920fcf commit d9d7c23

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

templates/repo/diff/blob_excerpt.tmpl

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,19 @@
2323
</div>
2424
</td>
2525
<td colspan="7" class="lines-code lines-code-old ">{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}{{/*
26+
*/}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/*
27+
*/}}{{svg "octicon-plus"}}{{/*
28+
*/}}</button>{{/*
2629
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td>
2730
{{else}}
2831
{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}
2932
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$.FileNameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
3033
<td class="lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
3134
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td>
3235
<td class="lines-code lines-code-old">{{/*
36+
*/}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/*
37+
*/}}{{svg "octicon-plus"}}{{/*
38+
*/}}</button>{{/*
3339
*/}}{{if $line.LeftIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/*
3440
*/}}<code class="code-inner"></code>{{/*
3541
*/}}{{end}}{{/*
@@ -38,12 +44,22 @@
3844
<td class="lines-escape lines-escape-new">{{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
3945
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td>
4046
<td class="lines-code lines-code-new">{{/*
47+
*/}}<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/*
48+
*/}}{{svg "octicon-plus"}}{{/*
49+
*/}}</button>{{/*
4150
*/}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/*
4251
*/}}<code class="code-inner"></code>{{/*
4352
*/}}{{end}}{{/*
4453
*/}}</td>
4554
{{end}}
4655
</tr>
56+
{{if $line.Comments}}
57+
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
58+
<td class="add-comment-left add-comment-right" colspan="5">
59+
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
60+
</td>
61+
</tr>
62+
{{end}}
4763
{{end}}
4864
{{else}}
4965
{{range $k, $line := $.section.Lines}}
@@ -76,7 +92,14 @@
7692
{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}
7793
<td class="lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
7894
<td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
79-
<td class="lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td>
95+
<td class="lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{svg "octicon-plus"}}</button><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td>
8096
</tr>
97+
{{if $line.Comments}}
98+
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
99+
<td class="add-comment-left add-comment-right" colspan="5">
100+
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
101+
</td>
102+
</tr>
103+
{{end}}
81104
{{end}}
82105
{{end}}

0 commit comments

Comments
 (0)