Add whitespace removal inside template curly brackes (#20853)

Author: silverwind

Makefile

@@ -242,8 +242,10 @@ clean:
 
 .PHONY: fmt
 fmt:
-	@echo "Running gitea-fmt (with gofumpt)..."
 	@MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
+	$(eval TEMPLATES := $(wildcard templates/**/*.tmpl))
+	@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it 
+	@$(SED_INPLACE) -e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' $(TEMPLATES)
 
 .PHONY: vet
 vet:
@@ -288,13 +290,19 @@ errcheck:
 
 .PHONY: fmt-check
 fmt-check:
-	# get all go files and run gitea-fmt (with gofmt) on them
+	@# get all go files and run gitea-fmt (with gofmt) on them
 	@diff=$$(MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -l '{file-list}'); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make fmt' and commit the result:"; \
 		echo "$${diff}"; \
 		exit 1; \
 	fi
+	@diff2=$$(git diff templates); \
+	if [ -n "$$diff2" ]; then \
+		echo "Please run 'make fmt' and commit the result:"; \
+		echo "$${diff2}"; \
+		exit 1; \
+	fi
 
 .PHONY: checks
 checks: checks-frontend checks-backend

templates/admin/config.tmpl

@@ -50,7 +50,7 @@
 				<dt>{{.locale.Tr "admin.config.reverse_auth_user"}}</dt>
 				<dd>{{.ReverseProxyAuthUser}}</dd>
 
-				{{if .EnvVars }}
+				{{if .EnvVars}}
 				<div class="ui divider"></div>
 				{{range .EnvVars}}
 				<dt>{{.Name}}</dt>

templates/admin/cron.tmpl

@@ -22,9 +22,9 @@
 						<td>{{$.locale.Tr (printf "admin.dashboard.%s" .Name)}}</td>
 						<td>{{.Spec}}</td>
 						<td>{{DateFmtLong .Next}}</td>
-						<td>{{if gt .Prev.Year 1 }}{{DateFmtLong .Prev}}{{else}}N/A{{end}}</td>
+						<td>{{if gt .Prev.Year 1}}{{DateFmtLong .Prev}}{{else}}N/A{{end}}</td>
 						<td>{{.ExecTimes}}</td>
-						<td {{if ne .Status ""}}class="tooltip" data-content="{{.FormatLastMessage $.locale}}"{{end}} >{{if eq .Status "" }}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}</td>
+						<td {{if ne .Status ""}}class="tooltip" data-content="{{.FormatLastMessage $.locale}}"{{end}} >{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}</td>
 					</tr>
 				{{end}}
 			</tbody>

templates/admin/notice.tmpl

@@ -34,7 +34,7 @@
 						</tr>
 					{{end}}
 				</tbody>
-				{{ if .Notices }}
+				{{if .Notices}}
 					<tfoot class="full-width">
 							<tr>
 								<th></th>
@@ -65,11 +65,11 @@
 								</th>
 							</tr>
 					</tfoot>
-				{{ end }}
+				{{end}}
 			</table>
 		</div>
 
-		{{ template "base/paginate" . }}
+		{{template "base/paginate" .}}
 	</div>
 </div>
 

templates/admin/process-row.tmpl

@@ -1,6 +1,6 @@
 <div class="item">
 	<div class="df ac">
-		<div class="icon ml-3 mr-3">{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16 }}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16 }}{{else}}{{svg "octicon-terminal" 16 }}{{end}}</div>
+		<div class="icon ml-3 mr-3">{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}</div>
 		<div class="content f1">
 			<div class="header">{{.Process.Description}}</div>
 			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span></div>

templates/admin/queue.tmpl

@@ -30,12 +30,12 @@
 				</tbody>
 			</table>
 		</div>
-		{{if lt $sum 0 }}
+		{{if lt $sum 0}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queue.nopool.title"}}
 		</h4>
 		<div class="ui attached segment">
-			{{if eq .Queue.Type "wrapped" }}
+			{{if eq .Queue.Type "wrapped"}}
 			<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
 			{{else if eq .Queue.Type "persistable-channel"}}
 			<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
@@ -58,7 +58,7 @@
 					</div>
 					<div class="inline field">
 						<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
-						<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout }}">
+						<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout}}">
 					</div>
 					<div class="inline field">
 						<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
@@ -166,7 +166,7 @@
 					</tr>
 					{{else}}
 						<tr>
-							<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none" }}
+							<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none"}}
 						</tr>
 					{{end}}
 				</tbody>

templates/admin/stacktrace-row.tmpl

@@ -2,21 +2,21 @@
 	<div class="df ac">
 		<div class="icon ml-3 mr-3">
 			{{if eq .Process.Type "request"}}
-				{{svg "octicon-globe" 16 }}
+				{{svg "octicon-globe" 16}}
 			{{else if eq .Process.Type "system"}}
-				{{svg "octicon-cpu" 16 }}
+				{{svg "octicon-cpu" 16}}
 			{{else if eq .Process.Type "normal"}}
-				{{svg "octicon-terminal" 16 }}
+				{{svg "octicon-terminal" 16}}
 			{{else}}
-				{{svg "octicon-code" 16 }}
+				{{svg "octicon-code" 16}}
 			{{end}}
 		</div>
 		<div class="content f1">
 			<div class="header">{{.Process.Description}}</div>
 			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span>{{end}}</div>
 		</div>
 		<div>
-			{{if or (eq .Process.Type "request") (eq .Process.Type "normal") }}
+			{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}
 				<a class="delete-button icon" href="" data-url="{{.root.Link}}/cancel/{{.Process.PID}}" data-id="{{.Process.PID}}" data-name="{{.Process.Description}}">{{svg "octicon-trash" 16 "text-red"}}</a>
 			{{end}}
 		</div>
@@ -29,7 +29,7 @@
 						<summary>
 							<div class="dif content">
 								<div class="header ml-3">
-									<span class="icon mr-3">{{svg "octicon-code" 16 }}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
+									<span class="icon mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
 								</div>
 								<div class="description">
 									{{range .Labels}}
@@ -41,7 +41,7 @@
 						<div class="list">
 							{{range .Entry}}
 								<div class="item df ac">
-									<span class="icon mr-4">{{svg "octicon-dot-fill" 16 }}</span>
+									<span class="icon mr-4">{{svg "octicon-dot-fill" 16}}</span>
 									<div class="content f1">
 										<div class="header"><code>{{.Function}}</code></div>
 										<div class="description"><code>{{.File}}:{{.Line}}</code></div>

templates/base/footer.tmpl

@@ -16,7 +16,7 @@
 <!-- Third-party libraries -->
 {{if .EnableCaptcha}}
 	{{if eq .CaptchaType "recaptcha"}}
-		<script src='{{ URLJoin .RecaptchaURL "api.js"}}' async></script>
+		<script src='{{URLJoin .RecaptchaURL "api.js"}}' async></script>
 	{{end}}
 	{{if eq .CaptchaType "hcaptcha"}}
 		<script src='https://hcaptcha.com/1/api.js' async></script>

templates/base/head.tmpl

@@ -65,8 +65,8 @@
 	<meta property="og:description" content="{{MetaDescription}}">
 {{end}}
 <meta property="og:site_name" content="{{AppName}}">
-{{if .IsSigned }}
-	{{ if ne .SignedUser.Theme "gitea" }}
+{{if .IsSigned}}
+	{{if ne .SignedUser.Theme "gitea"}}
 		<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{.SignedUser.Theme | PathEscape}}.css?v={{AssetVersion}}">
 	{{end}}
 {{else if ne DefaultTheme "gitea"}}

templates/base/head_script.tmpl

@@ -21,18 +21,18 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
 		enableTimeTracking: {{EnableTimetracking}},
 		{{if .RequireTribute}}
 		tributeValues: Array.from(new Map([
-			{{ range .Participants }}
+			{{range .Participants}}
 			['{{.Name}}', {key: '{{.Name}} {{.FullName}}', value: '{{.Name}}',
 			name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.AvatarLink}}'}],
-			{{ end }}
-			{{ range .Assignees }}
+			{{end}}
+			{{range .Assignees}}
 			['{{.Name}}', {key: '{{.Name}} {{.FullName}}', value: '{{.Name}}',
 			name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.AvatarLink}}'}],
-			{{ end }}
-			{{ range .MentionableTeams }}
+			{{end}}
+			{{range .MentionableTeams}}
 				['{{$.MentionableTeamsOrg}}/{{.Name}}', {key: '{{$.MentionableTeamsOrg}}/{{.Name}}', value: '{{$.MentionableTeamsOrg}}/{{.Name}}',
 				name: '{{$.MentionableTeamsOrg}}/{{.Name}}', avatar: '{{$.MentionableTeamsOrgAvatar}}'}],
-			{{ end }}
+			{{end}}
 		]).values()),
 		{{end}}
 		mermaidMaxSourceCharacters: {{MermaidMaxSourceCharacters}},