mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	This PR rewrites the invisible unicode detection algorithm to more closely match that of the Monaco editor on the system. It provides a technique for detecting ambiguous characters and relaxes the detection of combining marks. Control characters are in addition detected as invisible in this implementation whereas they are not on monaco but this is related to font issues. Close #19913 Signed-off-by: Andrew Thornton <art27@cantab.net>
		
			
				
	
	
		
			77 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
			
		
		
	
	
			77 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
| {{if $.IsSplitStyle}}
 | |
| 	{{range $k, $line := $.section.Lines}}
 | |
| 	<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
 | |
| 		{{if eq .GetType 4}}
 | |
| 			<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}">
 | |
| 				{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }}
 | |
| 					<a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.PageIsWiki}}" data-anchor="{{$.Anchor}}">
 | |
| 						{{svg "octicon-fold-down"}}
 | |
| 					</a>
 | |
| 				{{end}}
 | |
| 				{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }}
 | |
| 					<a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up&wiki={{$.PageIsWiki}}" data-anchor="{{$.Anchor}}">
 | |
| 						{{svg "octicon-fold-up"}}
 | |
| 					</a>
 | |
| 				{{end}}
 | |
| 				{{if eq $line.GetExpandDirection 2}}
 | |
| 					<a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=&wiki={{$.PageIsWiki}}" data-anchor="{{$.Anchor}}">
 | |
| 						{{svg "octicon-fold"}}
 | |
| 					</a>
 | |
| 				{{end}}
 | |
| 			</td>
 | |
| 			<td colspan="5" class="lines-code lines-code-old ">{{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}{{/*
 | |
| 				*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}</td>
 | |
| 		{{else}}
 | |
| 			{{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}
 | |
| 			<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>
 | |
| 			<td class="blob-excerpt lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"></a>{{end}}</td>
 | |
| 			<td class="blob-excerpt lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="mono" data-type-marker=""></span>{{end}}</td>
 | |
| 			<td class="blob-excerpt lines-code lines-code-old halfwidth">{{/*
 | |
| 				*/}}{{if $line.LeftIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.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-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
 | |
| 			<td class="blob-excerpt lines-escape lines-escape-new">{{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"></a>{{end}}</td>
 | |
| 			<td class="blob-excerpt lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="mono" data-type-marker=""></span>{{end}}</td>
 | |
| 			<td class="blob-excerpt lines-code lines-code-new halfwidth">{{/*
 | |
| 				*/}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}{{else}}{{/*
 | |
| 					*/}}<code class="code-inner"></code>{{/*
 | |
| 				*/}}{{end}}{{/*
 | |
| 			*/}}</td>
 | |
| 		{{end}}
 | |
| 	</tr>
 | |
| 	{{end}}
 | |
| {{else}}
 | |
| 	{{range $k, $line := $.section.Lines}}
 | |
| 	<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
 | |
| 		{{if eq .GetType 4}}
 | |
| 			<td colspan="2" class="lines-num">
 | |
| 				{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }}
 | |
| 					<a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.PageIsWiki}}" data-anchor="{{$.Anchor}}">
 | |
| 						{{svg "octicon-fold-down"}}
 | |
| 					</a>
 | |
| 				{{end}}
 | |
| 				{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }}
 | |
| 					<a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&wiki={{$.PageIsWiki}}" data-anchor="{{$.Anchor}}">
 | |
| 						{{svg "octicon-fold-up"}}
 | |
| 					</a>
 | |
| 				{{end}}
 | |
| 				{{if eq $line.GetExpandDirection 2}}
 | |
| 					<a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=&wiki={{$.PageIsWiki}}" data-anchor="{{$.Anchor}}">
 | |
| 						{{svg "octicon-fold"}}
 | |
| 					</a>
 | |
| 				{{end}}
 | |
| 			</td>
 | |
| 		{{else}}
 | |
| 			<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>
 | |
| 			<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
 | |
| 		{{end}}
 | |
| 		{{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}
 | |
| 		<td class="blob-excerpt lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.locale}}"></a>{{end}}</td>
 | |
| 		<td class="blob-excerpt lines-type-marker"><span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
 | |
| 		<td class="blob-excerpt 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 "locale" $.locale}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td>
 | |
| 	</tr>
 | |
| 	{{end}}
 | |
| {{end}}
 |