use alias when invalid pkg name

99designs · Jul 25, 2019 · fbbed5b · fbbed5b
1 parent 2591ea3
commit fbbed5b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/codegen/templates/import.go b/codegen/templates/import.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"go/types"
 	"strconv"
+	"strings"
 
 	"github.com/99designs/gqlgen/internal/code"
 )
@@ -20,7 +21,7 @@ type Imports struct {
 }
 
 func (i *Import) String() string {
-	if i.Alias == i.Name {
+	if strings.HasSuffix(i.Path, i.Alias) {
 		return strconv.Quote(i.Path)
 	}
 

diff --git a/codegen/templates/import_test.go b/codegen/templates/import_test.go
@@ -59,7 +59,7 @@ func TestImports(t *testing.T) {
 			t,
 			`"github.com/99designs/gqlgen/codegen/templates/testdata/a/bar"
 bar1 "github.com/99designs/gqlgen/codegen/templates/testdata/b/bar"
-"github.com/99designs/gqlgen/codegen/templates/testdata/pkg_mismatch"`,
+turtles "github.com/99designs/gqlgen/codegen/templates/testdata/pkg_mismatch"`,
 			a.String(),
 		)
 	})

diff --git a/integration/generated.go b/integration/generated.go