mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-30 00:01:24 +00:00
e24f651c86
So I found this [linter](https://github.com/Riverside-Healthcare/djlint) which features a mode for go templates, so I gave it a try and it did find a number of valid issue, like unbalanced tags etc. It also has a number of bugs, I had to disable/workaround many issues. Given that this linter is written in python, this does add a dependency on `python` >= 3.8 and `poetry` to the development environment to be able to run this linter locally. - `e.g.` prefixes on placeholders are removed because the linter had a false-positive on `placeholder="e.g. cn=Search"` for the `attr=value` syntax and it's not ideal anyways to write `e.g.` into a placeholder because a placeholder is meant to hold a sample value. - In `templates/repo/settings/options.tmpl` I simplified the logic to not conditionally create opening tags without closing tags because this stuff confuses the linter (and possibly the reader as well).
156 lines
9.4 KiB
Handlebars
156 lines
9.4 KiB
Handlebars
{{$file := .file}}
|
|
<colgroup>
|
|
<col width="50">
|
|
<col width="10">
|
|
<col width="10">
|
|
<col>
|
|
<col width="50">
|
|
<col width="10">
|
|
<col width="10">
|
|
<col>
|
|
</colgroup>
|
|
{{range $j, $section := $file.Sections}}
|
|
{{range $k, $line := $section.Lines}}
|
|
{{$hasmatch := ne $line.Match -1}}
|
|
{{if or (ne .GetType 2) (not $hasmatch)}}
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
|
|
{{if eq .GetType 4}}
|
|
<td class="lines-num lines-num-old">
|
|
<div class="gt-df">
|
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
|
<button class="code-expander-button" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
|
{{svg "octicon-fold-down"}}
|
|
</button>
|
|
{{end}}
|
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}}
|
|
<button class="code-expander-button" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
|
{{svg "octicon-fold-up"}}
|
|
</button>
|
|
{{end}}
|
|
{{if eq $line.GetExpandDirection 2}}
|
|
<button class="code-expander-button" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
|
{{svg "octicon-fold"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
</td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}}
|
|
<td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}</td>
|
|
<td colspan="6" class="lines-code lines-code-old ">{{/*
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
|
|
*/}}</td>
|
|
{{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}}
|
|
{{$match := index $section.Lines $line.Match}}
|
|
{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line $.root.locale}}{{end}}
|
|
{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match $.root.locale}}{{end}}
|
|
<td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{$file.NameHash}}L{{$line.LeftIdx}}"></span></td>
|
|
<td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-old del-code"><span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
|
<td class="lines-code lines-code-old 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-side="left" data-idx="{{$line.LeftIdx}}">{{/*
|
|
*/}}{{svg "octicon-plus"}}{{/*
|
|
*/}}</a>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}{{if $line.LeftIdx}}{{/*
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $leftDiff "locale" $.root.locale}}{{/*
|
|
*/}}{{else}}{{/*
|
|
*/}}<code class="code-inner"></code>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}</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-{{$file.NameHash}}R{{$match.RightIdx}}{{end}}"></span></td>
|
|
<td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $rightDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="gt-mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td>
|
|
<td class="lines-code lines-code-new 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-side="right" data-idx="{{$match.RightIdx}}">{{/*
|
|
*/}}{{svg "octicon-plus"}}{{/*
|
|
*/}}</a>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}{{if $match.RightIdx}}{{/*
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $rightDiff "locale" $.root.locale}}{{/*
|
|
*/}}{{else}}{{/*
|
|
*/}}<code class="code-inner"></code>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}</td>
|
|
{{else}}
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}}
|
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
|
|
<td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
|
|
<td class="lines-code lines-code-old">{{/*
|
|
*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/*
|
|
*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/*
|
|
*/}}{{svg "octicon-plus"}}{{/*
|
|
*/}}</a>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}{{if $line.LeftIdx}}{{/*
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
|
|
*/}}{{else}}{{/*
|
|
*/}}<code class="code-inner"></code>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}</td>
|
|
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
|
|
<td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
|
|
<td class="lines-code lines-code-new">{{/*
|
|
*/}}{{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-side="right" data-idx="{{$line.RightIdx}}">{{/*
|
|
*/}}{{svg "octicon-plus"}}{{/*
|
|
*/}}</a>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}{{if $line.RightIdx}}{{/*
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
|
|
*/}}{{else}}{{/*
|
|
*/}}<code class="code-inner"></code>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}</td>
|
|
{{end}}
|
|
</tr>
|
|
{{if and (eq .GetType 3) $hasmatch}}
|
|
{{$match := index $section.Lines $line.Match}}
|
|
{{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}}
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
|
<td class="add-comment-left" colspan="4">
|
|
{{if gt (len $line.Comments) 0}}
|
|
{{if eq $line.GetCommentSide "previous"}}
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
{{if gt (len $match.Comments) 0}}
|
|
{{if eq $match.GetCommentSide "previous"}}
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
<td class="add-comment-right" colspan="4">
|
|
{{if eq $line.GetCommentSide "proposed"}}
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
|
{{end}}
|
|
{{if gt (len $match.Comments) 0}}
|
|
{{if eq $match.GetCommentSide "proposed"}}
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
{{else if gt (len $line.Comments) 0}}
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
|
<td class="add-comment-left" colspan="4">
|
|
{{if gt (len $line.Comments) 0}}
|
|
{{if eq $line.GetCommentSide "previous"}}
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
<td class="add-comment-right" colspan="4">
|
|
{{if eq $line.GetCommentSide "proposed"}}
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
|
{{end}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|