Merge pull request #806 from leitzler/master

Ensure generated imports doesn't start with digit

Author: LandonTClipp

pkg/fixtures/12345678/http/http.go

@@ -0,0 +1,3 @@
+package http
+
+type MyStruct struct{}

pkg/fixtures/same_name_imports.go

@@ -3,11 +3,13 @@ package test
 import (
 	"net/http"
 
+	number_dir_http "github.com/vektra/mockery/v2/pkg/fixtures/12345678/http"
 	my_http "github.com/vektra/mockery/v2/pkg/fixtures/http"
 )
 
 // Example is an example
 type Example interface {
 	A() http.Flusher
 	B(fixtureshttp string) my_http.MyStruct
+	C(fixtureshttp string) number_dir_http.MyStruct
 }

pkg/generator.go

@@ -25,7 +25,7 @@ import (
 
 const mockConstructorParamTypeNamePrefix = "mockConstructorTestingT"
 
-var invalidIdentifierChar = regexp.MustCompile("[^[:digit:][:alpha:]_]")
+var invalidIdentifierChar = regexp.MustCompile("^[[:digit:]]|[^[:digit:][:alpha:]_]")
 
 func DetermineOutputPackageName(
 	interfaceFileName string,

pkg/generator_test.go

@@ -260,6 +260,7 @@ func (s *GeneratorSuite) TestGeneratorPrologueWithMultipleImportsSameName() {
 
 	expected := `package mocks
 
+import _2345678http "github.com/vektra/mockery/v2/pkg/fixtures/12345678/http"
 import fixtureshttp "github.com/vektra/mockery/v2/pkg/fixtures/http"
 import http "net/http"
 import mock "github.com/stretchr/testify/mock"