A better go code formatter, and now `make fmt` can run in Windows (#17684)

* go build / format tools
* re-format imports

18 files changed, 18 insertions, 4 deletions

diff --git a/integrations/api_issue_label_test.go b/integrations/api_issue_label_test.go
index 7cb5df812b..58e09c818e 100644
--- a/integrations/api_issue_label_test.go
+++ b/integrations/api_issue_label_test.go
@@ -10,9 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"code.gitea.io/gitea/models/unittest"
-
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/unittest"
 	api "code.gitea.io/gitea/modules/structs"
 
 	"github.com/stretchr/testify/assert"
diff --git a/integrations/api_private_serv_test.go b/integrations/api_private_serv_test.go
index 8d814271cd..c3cb1cf328 100644
--- a/integrations/api_private_serv_test.go
+++ b/integrations/api_private_serv_test.go
@@ -11,6 +11,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/private"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/api_pull_commits_test.go b/integrations/api_pull_commits_test.go
index c537f00208..a3d1bee58a 100644
--- a/integrations/api_pull_commits_test.go
+++ b/integrations/api_pull_commits_test.go
@@ -11,6 +11,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/unittest"
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/api_repo_git_notes_test.go b/integrations/api_repo_git_notes_test.go
index 21b8a931b0..293bd769f4 100644
--- a/integrations/api_repo_git_notes_test.go
+++ b/integrations/api_repo_git_notes_test.go
@@ -12,6 +12,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/unittest"
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/api_team_user_test.go b/integrations/api_team_user_test.go
index 7e5bb0802e..e7f4b0ee4c 100644
--- a/integrations/api_team_user_test.go
+++ b/integrations/api_team_user_test.go
@@ -13,6 +13,7 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/api_user_org_perm_test.go b/integrations/api_user_org_perm_test.go
index abba24701e..0dcdbd77ad 100644
--- a/integrations/api_user_org_perm_test.go
+++ b/integrations/api_user_org_perm_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/download_test.go b/integrations/download_test.go
index 38de75f476..f46122d951 100644
--- a/integrations/download_test.go
+++ b/integrations/download_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/setting"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/eventsource_test.go b/integrations/eventsource_test.go
index ead01da8ca..eb08c004a8 100644
--- a/integrations/eventsource_test.go
+++ b/integrations/eventsource_test.go
@@ -14,6 +14,7 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/eventsource"
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/git_clone_wiki_test.go b/integrations/git_clone_wiki_test.go
index 2139ce5fe0..16cee254bc 100644
--- a/integrations/git_clone_wiki_test.go
+++ b/integrations/git_clone_wiki_test.go
@@ -14,6 +14,7 @@ import (
 
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/util"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/goget_test.go b/integrations/goget_test.go
index 1003d71023..5dc9c5e0a8 100644
--- a/integrations/goget_test.go
+++ b/integrations/goget_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/setting"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/gpg_git_test.go b/integrations/gpg_git_test.go
index ecc2539784..b136e82281 100644
--- a/integrations/gpg_git_test.go
+++ b/integrations/gpg_git_test.go
@@ -17,6 +17,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
+
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/crypto/openpgp"
 	"golang.org/x/crypto/openpgp/armor"
diff --git a/integrations/org_count_test.go b/integrations/org_count_test.go
index c473ecd68a..a394dba01c 100644
--- a/integrations/org_count_test.go
+++ b/integrations/org_count_test.go
@@ -12,6 +12,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/unittest"
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/org_test.go b/integrations/org_test.go
index ac234de650..e94e4ea74c 100644
--- a/integrations/org_test.go
+++ b/integrations/org_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	api "code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/rename_branch_test.go b/integrations/rename_branch_test.go
index a8138ff0c5..1fe1983054 100644
--- a/integrations/rename_branch_test.go
+++ b/integrations/rename_branch_test.go
@@ -10,6 +10,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/unittest"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/repo_migrate_test.go b/integrations/repo_migrate_test.go
index 5a02b4ba03..e6ba15b137 100644
--- a/integrations/repo_migrate_test.go
+++ b/integrations/repo_migrate_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/structs"
+
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/repofiles_delete_test.go b/integrations/repofiles_delete_test.go
index 8150673e2b..eb73348950 100644
--- a/integrations/repofiles_delete_test.go
+++ b/integrations/repofiles_delete_test.go
@@ -8,9 +8,8 @@ import (
 	"net/url"
 	"testing"
 
-	"code.gitea.io/gitea/models/unittest"
-
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/repofiles"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/test"
diff --git a/integrations/signup_test.go b/integrations/signup_test.go
index 33e5809b28..38aa069f31 100644
--- a/integrations/signup_test.go
+++ b/integrations/signup_test.go
@@ -13,6 +13,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/setting"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/unknwon/i18n"
 )
diff --git a/integrations/user_avatar_test.go b/integrations/user_avatar_test.go
index e53f0e34fe..edc3a47314 100644
--- a/integrations/user_avatar_test.go
+++ b/integrations/user_avatar_test.go
@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/avatar"
+
 	"github.com/stretchr/testify/assert"
 )