mirror of https://github.com/go-gitea/gitea.git
Merge pull request #2674 from andreynering/highlight-little-refactoring
Little refactoring of diff highlight.
This commit is contained in:
commit
6e74dd4388
|
@ -161,7 +161,6 @@ type DiffFile struct {
|
|||
IsBin bool
|
||||
IsRenamed bool
|
||||
Sections []*DiffSection
|
||||
HighlightClass string
|
||||
}
|
||||
|
||||
func (diffFile *DiffFile) GetType() int {
|
||||
|
@ -169,10 +168,7 @@ func (diffFile *DiffFile) GetType() int {
|
|||
}
|
||||
|
||||
func (diffFile *DiffFile) GetHighlightClass() string {
|
||||
if diffFile.HighlightClass == "" {
|
||||
diffFile.HighlightClass = highlight.FileNameToHighlightClass(diffFile.Name)
|
||||
}
|
||||
return diffFile.HighlightClass
|
||||
return highlight.FileNameToHighlightClass(diffFile.Name)
|
||||
}
|
||||
|
||||
type Diff struct {
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
</div>
|
||||
|
||||
{{range $i, $file := .Diff.Files}}
|
||||
{{$highlightClass := $file.GetHighlightClass}}
|
||||
<div class="diff-file-box diff-box file-content" id="diff-{{.Index}}">
|
||||
<h4 class="ui top attached normal header">
|
||||
<div class="diff-counter count ui left">
|
||||
|
@ -76,13 +77,13 @@
|
|||
<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
|
||||
</td>
|
||||
<td class="lines-code halfwidth">
|
||||
<pre><code class="wrap {{if $file.GetHighlightClass}}language-{{$file.GetHighlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
|
||||
<pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
|
||||
</td>
|
||||
<td class="lines-num lines-num-new">
|
||||
<span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
|
||||
</td>
|
||||
<td class="lines-code halfwidth">
|
||||
<pre><code class="wrap {{if $file.GetHighlightClass}}language-{{$file.GetHighlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
|
||||
<pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
|
@ -104,7 +105,7 @@
|
|||
</td>
|
||||
{{end}}
|
||||
<td class="lines-code">
|
||||
<pre><code class="{{if $file.GetHighlightClass}}language-{{$file.GetHighlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
|
||||
<pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
|
|
Loading…
Reference in New Issue