mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Replace whitespace inside template parens during make fmt (#24293)
Remove space/tab after `(` and before `)` in templates. Only two violations it seems.
This commit is contained in:
		
							
								
								
									
										8
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								Makefile
									
									
									
									
									
								
							@@ -278,8 +278,12 @@ clean:
 | 
			
		||||
fmt:
 | 
			
		||||
	GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
 | 
			
		||||
	$(eval TEMPLATES := $(shell find templates -type f -name '*.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)
 | 
			
		||||
	@# strip whitespace after '{{' or '(' and before '}}' or ')' unless there is only
 | 
			
		||||
	@# whitespace before it
 | 
			
		||||
	@$(SED_INPLACE) \
 | 
			
		||||
		-e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' \
 | 
			
		||||
	  -e 's/([ 	]\{1,\}/(/g' -e '/^[ 	]\{1,\})/! s/[ 	]\{1,\})/)/g' \
 | 
			
		||||
	  $(TEMPLATES)
 | 
			
		||||
 | 
			
		||||
.PHONY: fmt-check
 | 
			
		||||
fmt-check: fmt
 | 
			
		||||
 
 | 
			
		||||
@@ -42,7 +42,7 @@
 | 
			
		||||
					{{end}}
 | 
			
		||||
				</div>
 | 
			
		||||
				<div class="three wide column">
 | 
			
		||||
					{{if and (not $.PageIsOrgSettingsLabels ) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
 | 
			
		||||
					{{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
 | 
			
		||||
						<a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a>
 | 
			
		||||
						<a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a>
 | 
			
		||||
					{{else if $.PageIsOrgSettingsLabels}}
 | 
			
		||||
 
 | 
			
		||||
@@ -52,7 +52,7 @@
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{$.locale.Tr "repo.settings.teams"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
 | 
			
		||||
		{{$allowedToChangeTeams := (or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
 | 
			
		||||
		{{if .Teams}}
 | 
			
		||||
		<div class="ui attached segment collaborator list">
 | 
			
		||||
			{{range $t, $team := .Teams}}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user