Merge pull request #828 from alexandear/refactor/enable-gofumpt

Enable gofumpt linter and cleanup formatting

.golangci.yml

@@ -6,6 +6,7 @@ linters:
   # https://golangci-lint.run/usage/linters/#enabled-by-default
   enable:
     - errcheck
+    - gofumpt
     - gosimple
     - govet
     - ineffassign

cmd/mockery.go

@@ -113,7 +113,6 @@ func initConfig(
 	viperObj *viper.Viper,
 	configPath *pathlib.Path,
 ) *viper.Viper {
-
 	if baseSearchPath == nil {
 		currentWorkingDir, err := os.Getwd()
 		if err != nil {

cmd/mockery_test.go

@@ -157,22 +157,21 @@ packages:
     interfaces:
       FooInterface:
 `
-	//config := fmt.Sprintf(configFmt, tmpDir)
 	configPath := pathlib.NewPath(tmpDir).Join("config.yaml")
 	require.NoError(t, configPath.WriteFile([]byte(config)))
 
 	goModPath := pathlib.NewPath(tmpDir).Join("go.mod")
 	err := goModPath.WriteFile([]byte(`
 module github.com/testuser/testpackage
-                                                                                                                                                                                 
+
 go 1.20`))
 	require.NoError(t, err)
 
 	interfacePath := pathlib.NewPath(tmpDir).Join("internal", "foopkg", "interface.go")
 	require.NoError(t, interfacePath.Parent().MkdirAll())
 	require.NoError(t, interfacePath.WriteFile([]byte(`
 package foopkg
-																																												
+
 type FooInterface interface {
 		Foo()
 		Bar()

pkg/config/config.go

@@ -227,7 +227,6 @@ func (c *Config) getPackageConfigMap(ctx context.Context, packageName string) (m
 	emptyMap := map[string]any{}
 	packageSection[packageName] = emptyMap
 	return emptyMap, nil
-
 }
 
 // GetPackageConfig returns a struct representation of the package's config
@@ -490,7 +489,6 @@ func (c *Config) addSubPkgConfig(ctx context.Context, subPkgPath string, parentP
 		// own `config` section and merge with the parent package
 		// if so.
 		subPkgConfig, err := c.getPackageConfigMap(ctx, subPkgPath)
-
 		if err != nil {
 			log.Err(err).Msg("could not get child package config")
 			return fmt.Errorf("failed to get sub-package config: %w", err)
@@ -505,7 +503,6 @@ func (c *Config) addSubPkgConfig(ctx context.Context, subPkgPath string, parentP
 			if _, keyInSubPkg := subPkgConfigSection[key]; !keyInSubPkg {
 				subPkgConfigSection[key] = val
 			}
-
 		}
 	}
 
@@ -737,7 +734,6 @@ func (c *Config) discoverRecursivePackages(ctx context.Context) error {
 	log.Trace().Msg("done discovering recursive packages")
 
 	return nil
-
 }
 
 func contains[T comparable](slice []T, elem T) bool {
@@ -870,7 +866,6 @@ func (c *Config) mergeInConfig(ctx context.Context) error {
 	}
 
 	return nil
-
 }
 
 func (c *Config) getInterfacesForPackage(ctx context.Context, pkgPath string) ([]string, error) {
@@ -928,5 +923,4 @@ func (c *Config) LogUnsupportedPackagesConfig(ctx context.Context) {
 		Str("url", logging.DocsURL("/configuration/#parameter-descriptions")).
 		Logger()
 	l.Error().Msg("use of unsupported options detected. mockery behavior is undefined.")
-
 }

pkg/config/config_test.go

@@ -1273,7 +1273,6 @@ packages:
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			ctx := context.Background()
 			tmpdir := pathlib.NewPath(t.TempDir())
 			cfg := tmpdir.Join("config.yaml")
@@ -1308,7 +1307,6 @@ want
 ------
 %v`, string(cfgAsStr), tt.wantCfgMap)
 			}
-
 		})
 	}
 }

pkg/fixtures/method_args/same_name_arg_and_type/entity_test.go

@@ -66,5 +66,4 @@ func Test(t *testing.T) {
 
 		mockInterfaceA.AssertExpectations(t)
 	})
-
 }

pkg/fixtures/panic_err_test.go

@@ -26,5 +26,4 @@ func TestPanicOnNoReturnValue(t *testing.T) {
 	}()
 
 	m.DoSomething()
-
 }

pkg/fixtures/test/expecter_test.go

@@ -178,7 +178,6 @@ func TestExpecter(t *testing.T) {
 		require.Equal(t, 5, runCalled)
 		expMock.AssertExpectations(t)
 	})
-
 }
 
 func intfSlice(slice interface{}) []interface{} {

pkg/generator.go

@@ -502,7 +502,8 @@ type namer interface {
 func (g *Generator) renderNamedType(ctx context.Context, t interface {
 	Obj() *types.TypeName
 	TypeArgs() *types.TypeList
-}) string {
+},
+) string {
 	name := g.getPackageScopedType(ctx, t.Obj())
 	if t.TypeArgs() == nil || t.TypeArgs().Len() == 0 {
 		return name

pkg/logging/logging.go

@@ -28,6 +28,7 @@ const (
 
 // SemVer is the version of mockery at build time.
 var SemVer = ""
+
 var ErrPkgNotExist = errors.New("package does not exist")
 
 func GetSemverInfo() string {

pkg/parse.go

@@ -49,6 +49,7 @@ func ParserDisableFuncMocks(disable bool) func(*Parser) {
 		p.disableFuncMocks = disable
 	}
 }
+
 func NewParser(buildTags []string, opts ...func(*Parser)) *Parser {
 	var conf packages.Config
 	conf.Mode = packages.NeedTypes |
@@ -234,7 +235,8 @@ func (p *Parser) packageInterfaces(
 	pkg *types.Package,
 	fileName string,
 	declaredInterfaces []string,
-	ifaces []*Interface) []*Interface {
+	ifaces []*Interface,
+) []*Interface {
 	scope := pkg.Scope()
 	for _, name := range declaredInterfaces {
 		obj := scope.Lookup(name)

pkg/walker_test.go

@@ -136,7 +136,8 @@ func TestWalkerExclude(t *testing.T) {
 		Config: config.Config{
 			Exclude: []string{
 				getFixturePath("requester"),
-				getFixturePath("generic.go")},
+				getFixturePath("generic.go"),
+			},
 		},
 		Filter: regexp.MustCompile(".*"),
 	}