diff options
author | Wim <wim@42.be> | 2022-06-20 12:02:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-20 12:02:49 +0200 |
commit | cb50375e2b6abf0c79d4891e5e1ea775b9759cd2 (patch) | |
tree | 938af0f442baf79cebd114692aff5ad6af37f987 /modules/web | |
parent | 3289abcefc563d6ea16c1dbd19680b874a58a6d3 (diff) | |
download | gitea-cb50375e2b6abf0c79d4891e5e1ea775b9759cd2.tar.gz gitea-cb50375e2b6abf0c79d4891e5e1ea775b9759cd2.zip |
Add more linters to improve code readability (#19989)
Add nakedret, unconvert, wastedassign, stylecheck and nolintlint linters to improve code readability
- nakedret - https://github.com/alexkohler/nakedret - nakedret is a Go static analysis tool to find naked returns in functions greater than a specified function length.
- unconvert - https://github.com/mdempsky/unconvert - Remove unnecessary type conversions
- wastedassign - https://github.com/sanposhiho/wastedassign - wastedassign finds wasted assignment statements.
- notlintlint - Reports ill-formed or insufficient nolint directives
- stylecheck - https://staticcheck.io/docs/checks/#ST - keep style consistent
- excluded: [ST1003 - Poorly chosen identifier](https://staticcheck.io/docs/checks/#ST1003) and [ST1005 - Incorrectly formatted error string](https://staticcheck.io/docs/checks/#ST1005)
Diffstat (limited to 'modules/web')
-rw-r--r-- | modules/web/wrap_convert.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/web/wrap_convert.go b/modules/web/wrap_convert.go index b7bcbc6439..9084cfa074 100644 --- a/modules/web/wrap_convert.go +++ b/modules/web/wrap_convert.go @@ -28,7 +28,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { if r, ok := resp.(context.ResponseWriter); ok && r.Status() > 0 { done = true } - return + return done, deferrable } case func(http.ResponseWriter, *http.Request): return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -37,7 +37,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { if r, ok := resp.(context.ResponseWriter); ok && r.Status() > 0 { done = true } - return + return done, deferrable } case func(ctx *context.Context): @@ -46,7 +46,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { ctx := context.GetContext(req) t(ctx) done = ctx.Written() - return + return done, deferrable } case func(ctx *context.Context) goctx.CancelFunc: return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -54,7 +54,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { ctx := context.GetContext(req) deferrable = t(ctx) done = ctx.Written() - return + return done, deferrable } case func(*context.APIContext): return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -62,7 +62,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { ctx := context.GetAPIContext(req) t(ctx) done = ctx.Written() - return + return done, deferrable } case func(*context.APIContext) goctx.CancelFunc: return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -70,7 +70,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { ctx := context.GetAPIContext(req) deferrable = t(ctx) done = ctx.Written() - return + return done, deferrable } case func(*context.PrivateContext): return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -78,7 +78,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { ctx := context.GetPrivateContext(req) t(ctx) done = ctx.Written() - return + return done, deferrable } case func(*context.PrivateContext) goctx.CancelFunc: return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -86,7 +86,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { ctx := context.GetPrivateContext(req) deferrable = t(ctx) done = ctx.Written() - return + return done, deferrable } case func(http.Handler) http.Handler: return func(resp http.ResponseWriter, req *http.Request, others ...wrappedHandlerFunc) (done bool, deferrable func()) { @@ -102,7 +102,7 @@ func convertHandler(handler interface{}) wrappedHandlerFunc { if r, ok := resp.(context.ResponseWriter); ok && r.Status() > 0 { done = true } - return + return done, deferrable } default: panic(fmt.Sprintf("Unsupported handler type: %#v", t)) |