re-format

wxiaoguang · wxiaoguang · commit acb0007530bd · 2021-11-17T18:03:20.000+08:00
diff --git a/build/codeformat/formatimports.go b/build/codeformat/formatimports.go
@@ -46,7 +46,7 @@ func parseImportLine(line string) (*importLineParsed, error) {
 	pDot := strings.IndexRune(il.pkg, '.')
 	pSlash := strings.IndexRune(il.pkg, '/')
 	if pDot != -1 && pDot < pSlash {
-		il.group = il.pkg[:pSlash]
+		il.group = "domain-package"
 	}
 	for groupName := range importPackageGroupOrders {
 		if groupName == "" {
diff --git a/build/codeformat/formatimports_test.go b/build/codeformat/formatimports_test.go
@@ -86,11 +86,9 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"code.gitea.io/other/package"
-
 	"github.com/issue9/identicon"
 	"github.com/nfnt/resize"
 	"github.com/oliamb/cutter"
-
 	"xorm.io/the/package"
 )
 `
diff --git a/cmd/doctor.go b/cmd/doctor.go
@@ -19,7 +19,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/urfave/cli"
-
 	"xorm.io/xorm"
 )
 
diff --git a/cmd/dump.go b/cmd/dump.go
@@ -21,7 +21,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"gitea.com/go-chi/session"
-
 	archiver "github.com/mholt/archiver/v3"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/web.go b/cmd/web.go
@@ -21,7 +21,6 @@ import (
 	"code.gitea.io/gitea/routers/install"
 
 	"github.com/urfave/cli"
-
 	ini "gopkg.in/ini.v1"
 )
 
diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go
@@ -15,7 +15,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/urfave/cli"
-
 	ini "gopkg.in/ini.v1"
 )
 
diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go
@@ -37,7 +37,6 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
-
 	"xorm.io/xorm"
 )
 
diff --git a/integrations/create_no_session_test.go b/integrations/create_no_session_test.go
@@ -17,7 +17,6 @@ import (
 	"code.gitea.io/gitea/routers"
 
 	"gitea.com/go-chi/session"
-
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/integrations/gpg_git_test.go b/integrations/gpg_git_test.go
@@ -19,7 +19,6 @@ import (
 	"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/models/db/engine.go b/models/db/engine.go
@@ -16,13 +16,13 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	_ "github.com/denisenkom/go-mssqldb" // Needed for the MSSQL driver
-	_ "github.com/go-sql-driver/mysql"   // Needed for the MySQL driver
-	_ "github.com/lib/pq"                // Needed for the Postgresql driver
-
 	"xorm.io/xorm"
 	"xorm.io/xorm/names"
 	"xorm.io/xorm/schemas"
+
+	_ "github.com/denisenkom/go-mssqldb" // Needed for the MSSQL driver
+	_ "github.com/go-sql-driver/mysql"   // Needed for the MySQL driver
+	_ "github.com/lib/pq"                // Needed for the Postgresql driver
 )
 
 var (
diff --git a/models/db/sql_postgres_with_schema.go b/models/db/sql_postgres_with_schema.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/lib/pq"
-
 	"xorm.io/xorm/dialects"
 )
 
diff --git a/models/external_login_user.go b/models/external_login_user.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/structs"
 
 	"github.com/markbates/goth"
-
 	"xorm.io/builder"
 )
 
diff --git a/models/gpg_key.go b/models/gpg_key.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/keybase/go-crypto/openpgp"
 	"github.com/keybase/go-crypto/openpgp/packet"
-
 	"xorm.io/xorm"
 )
 
diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go
@@ -15,7 +15,6 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
-
 	"xorm.io/builder"
 )
 
diff --git a/models/login/oauth2_application.go b/models/login/oauth2_application.go
@@ -17,9 +17,7 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	uuid "github.com/google/uuid"
-
 	"golang.org/x/crypto/bcrypt"
-
 	"xorm.io/xorm"
 )
 
diff --git a/models/login/source_test.go b/models/login/source_test.go
@@ -13,7 +13,6 @@ import (
 	"code.gitea.io/gitea/modules/json"
 
 	"github.com/stretchr/testify/assert"
-
 	"xorm.io/xorm/schemas"
 )
 
diff --git a/models/login/twofactor.go b/models/login/twofactor.go
@@ -18,7 +18,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/pquerna/otp/totp"
-
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/unknwon/com"
-
 	"xorm.io/xorm"
 	"xorm.io/xorm/names"
 )
diff --git a/models/migrations/v166.go b/models/migrations/v166.go
@@ -12,7 +12,6 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/scrypt"
-
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )
diff --git a/models/migrations/v71.go b/models/migrations/v71.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"golang.org/x/crypto/pbkdf2"
-
 	"xorm.io/xorm"
 )
 
diff --git a/models/ssh_key.go b/models/ssh_key.go
@@ -17,7 +17,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"golang.org/x/crypto/ssh"
-
 	"xorm.io/builder"
 )
 
diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/models/db"
 
 	"github.com/stretchr/testify/assert"
-
 	"xorm.io/builder"
 )
 
diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/models/db"
 
 	"github.com/go-testfixtures/testfixtures/v3"
-
 	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )
diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go
@@ -18,7 +18,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/stretchr/testify/assert"
-
 	"xorm.io/xorm"
 	"xorm.io/xorm/names"
 )
diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go
@@ -10,7 +10,6 @@ import (
 	"code.gitea.io/gitea/models/db"
 
 	"github.com/stretchr/testify/assert"
-
 	"xorm.io/builder"
 )
 
diff --git a/models/user.go b/models/user.go
@@ -39,7 +39,6 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/scrypt"
-
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )
diff --git a/modules/cache/cache_redis.go b/modules/cache/cache_redis.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/nosql"
 
 	"gitea.com/go-chi/cache"
-
 	"github.com/go-redis/redis/v8"
 	"github.com/unknwon/com"
 )
diff --git a/modules/cache/cache_twoqueue.go b/modules/cache/cache_twoqueue.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/json"
 
 	mc "gitea.com/go-chi/cache"
-
 	lru "github.com/hashicorp/golang-lru"
 )
 
diff --git a/modules/charset/charset.go b/modules/charset/charset.go
@@ -16,7 +16,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/gogs/chardet"
-
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/transform"
 )
diff --git a/modules/context/context.go b/modules/context/context.go
@@ -34,12 +34,10 @@ import (
 
 	"gitea.com/go-chi/cache"
 	"gitea.com/go-chi/session"
-
 	chi "github.com/go-chi/chi/v5"
 	"github.com/unknwon/com"
 	"github.com/unknwon/i18n"
 	"github.com/unrolled/render"
-
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/modules/doctor/misc.go b/modules/doctor/misc.go
@@ -21,7 +21,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	lru "github.com/hashicorp/golang-lru"
-
 	"xorm.io/builder"
 )
 
diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
@@ -16,7 +16,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/stretchr/testify/assert"
-
 	"gopkg.in/ini.v1"
 )
 
diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go
@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/stretchr/testify/assert"
-
 	"gopkg.in/ini.v1"
 )
 
diff --git a/modules/log/console_windows.go b/modules/log/console_windows.go
@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"github.com/mattn/go-isatty"
-
 	"golang.org/x/sys/windows"
 )
 
diff --git a/modules/markup/html.go b/modules/markup/html.go
@@ -24,10 +24,8 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/unknwon/com"
-
 	"golang.org/x/net/html"
 	"golang.org/x/net/html/atom"
-
 	"mvdan.cc/xurls/v2"
 )
 
diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/yuin/goldmark/ast"
 	east "github.com/yuin/goldmark/extension/ast"
-
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/modules/session/redis.go b/modules/session/redis.go
@@ -25,7 +25,6 @@ import (
 	"code.gitea.io/gitea/modules/nosql"
 
 	"gitea.com/go-chi/session"
-
 	"github.com/go-redis/redis/v8"
 )
 
diff --git a/modules/setting/cron_test.go b/modules/setting/cron_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	ini "gopkg.in/ini.v1"
 )
 
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
@@ -30,9 +30,7 @@ import (
 
 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/unknwon/com"
-
 	gossh "golang.org/x/crypto/ssh"
-
 	ini "gopkg.in/ini.v1"
 )
 
diff --git a/modules/setting/storage_test.go b/modules/setting/storage_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	ini "gopkg.in/ini.v1"
 )
 
diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go
@@ -28,7 +28,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"github.com/gliderlabs/ssh"
-
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/modules/translation/translation.go b/modules/translation/translation.go
@@ -10,7 +10,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/unknwon/i18n"
-
 	"golang.org/x/text/language"
 )
 
diff --git a/modules/validation/binding.go b/modules/validation/binding.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"gitea.com/go-chi/binding"
-
 	"github.com/gobwas/glob"
 )
 
diff --git a/modules/validation/binding_test.go b/modules/validation/binding_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"gitea.com/go-chi/binding"
-
 	chi "github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/modules/validation/glob_pattern_test.go b/modules/validation/glob_pattern_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"gitea.com/go-chi/binding"
-
 	"github.com/gobwas/glob"
 )
 
diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go
@@ -13,7 +13,6 @@ import (
 	"code.gitea.io/gitea/modules/validation"
 
 	"gitea.com/go-chi/binding"
-
 	"github.com/unknwon/com"
 )
 
diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go
diff --git a/modules/web/route.go b/modules/web/route.go
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
diff --git a/routers/install/install.go b/routers/install/install.go
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
diff --git a/routers/web/user/oauth.go b/routers/web/user/oauth.go
diff --git a/routers/web/web.go b/routers/web/web.go
diff --git a/services/auth/source/oauth2/jwtsigningkey.go b/services/auth/source/oauth2/jwtsigningkey.go
diff --git a/services/auth/source/oauth2/store.go b/services/auth/source/oauth2/store.go
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go
diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go
diff --git a/services/migrations/github.go b/services/migrations/github.go

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func parseImportLine(line string) (*importLineParsed, error) {`
`46`	`46`	`pDot := strings.IndexRune(il.pkg, '.')`
`47`	`47`	`pSlash := strings.IndexRune(il.pkg, '/')`
`48`	`48`	`if pDot != -1 && pDot < pSlash {`
`49`		`- il.group = il.pkg[:pSlash]`
	`49`	`+ il.group = "domain-package"`
`50`	`50`	`}`
`51`	`51`	`for groupName := range importPackageGroupOrders {`
`52`	`52`	`if groupName == "" {`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,9 @@ import (`
`86`	`86`	`"code.gitea.io/gitea/modules/util"`
`87`	`87`
`88`	`88`	`"code.gitea.io/other/package"`
`89`		`-`
`90`	`89`	`"github.com/issue9/identicon"`
`91`	`90`	`"github.com/nfnt/resize"`
`92`	`91`	`"github.com/oliamb/cutter"`
`93`		`-`
`94`	`92`	`"xorm.io/the/package"`
`95`	`93`	`)`
`96`	`94`	`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import (`
`19`	`19`	`"code.gitea.io/gitea/modules/setting"`
`20`	`20`
`21`	`21`	`"github.com/urfave/cli"`
`22`		`-`
`23`	`22`	`"xorm.io/xorm"`
`24`	`23`	`)`
`25`	`24`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"code.gitea.io/gitea/modules/util"`
`22`	`22`
`23`	`23`	`"gitea.com/go-chi/session"`
`24`		`-`
`25`	`24`	`archiver "github.com/mholt/archiver/v3"`
`26`	`25`	`"github.com/urfave/cli"`
`27`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ import (`
`15`	`15`	`"code.gitea.io/gitea/modules/util"`
`16`	`16`
`17`	`17`	`"github.com/urfave/cli"`
`18`		`-`
`19`	`18`	`ini "gopkg.in/ini.v1"`
`20`	`19`	`)`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ import (`
`37`	`37`	`"github.com/go-git/go-git/v5"`
`38`	`38`	`"github.com/go-git/go-git/v5/config"`
`39`	`39`	`"github.com/go-git/go-git/v5/plumbing"`
`40`		`-`
`41`	`40`	`"xorm.io/xorm"`
`42`	`41`	`)`
`43`	`42`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ import (`
`17`	`17`	`"code.gitea.io/gitea/routers"`
`18`	`18`
`19`	`19`	`"gitea.com/go-chi/session"`
`20`		`-`
`21`	`20`	`"github.com/stretchr/testify/assert"`
`22`	`21`	`)`
`23`	`22`