mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-22 08:42:32 -05:00
56b7478b25
- Adjust the counting of the number of lines of a file to match the
amount of rendered lines. This simply means that a file with the content
of `a\n` will be shown as having `1 line` rather than `2 lines`. This
matches with the amount of lines that are being rendered (the last empty
line is never rendered) and matches more with the expecation of the
user (a trailing EOL is a technical detail).
- In the case there's no EOL, the reason why it was counting
'incorrectly' was to show if there was a trailing EOL or not, but now
text is shown to tell the user this.
- Integration test added.
- Resolves Codeberg/Community#1612
(cherry picked from commit 5cf976739c)
53 lines
1.4 KiB
Go HTML Template
53 lines
1.4 KiB
Go HTML Template
<div class="file-info tw-font-mono">
|
|
{{if .FileIsSymlink}}
|
|
<div class="file-info-entry">
|
|
{{ctx.Locale.Tr "repo.symbolic_link"}}
|
|
</div>
|
|
{{end}}
|
|
{{if .NumLinesSet}}{{/* Explicit attribute needed to show 0 line changes */}}
|
|
<div class="file-info-entry">
|
|
{{.NumLines}} {{ctx.Locale.TrN .NumLines "repo.line" "repo.lines"}}
|
|
</div>
|
|
{{end}}
|
|
{{if and .HasTrailingEOLSet (not .HasTrailingEOL)}}
|
|
<div class="file-info-entry" data-tooltip-content="{{ctx.Locale.Tr "repo.no_eol.tooltip"}}">
|
|
{{ctx.Locale.Tr "repo.no_eol.text"}}
|
|
</div>
|
|
{{end}}
|
|
{{if .FileSize}}
|
|
<div class="file-info-entry">
|
|
{{ctx.Locale.TrSize .FileSize}}{{if .IsLFSFile}} ({{ctx.Locale.Tr "repo.stored_lfs"}}){{end}}
|
|
</div>
|
|
{{end}}
|
|
{{if .LFSLock}}
|
|
<div class="file-info-entry ui" data-tooltip-content="{{.LFSLockHint}}">
|
|
{{svg "octicon-lock" 16 "tw-mr-1"}}
|
|
<a href="{{.LFSLockOwnerHomeLink}}">{{.LFSLockOwner}}</a>
|
|
</div>
|
|
{{end}}
|
|
{{if .LexerName}}
|
|
<div class="file-info-entry">
|
|
{{.LexerName}}
|
|
</div>
|
|
{{end}}
|
|
{{if .IsExecutable}}
|
|
<div class="file-info-entry">
|
|
{{ctx.Locale.Tr "repo.executable_file"}}
|
|
</div>
|
|
{{end}}
|
|
{{if .IsVendored}}
|
|
<div class="file-info-entry">
|
|
{{ctx.Locale.Tr "repo.vendored"}}
|
|
</div>
|
|
{{end}}
|
|
{{if .IsGenerated}}
|
|
<div class="file-info-entry">
|
|
{{ctx.Locale.Tr "repo.generated"}}
|
|
</div>
|
|
{{end}}
|
|
{{if .ImageSize}}
|
|
<div class="file-info-entry">
|
|
{{.ImageSize}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|