Merge pull request #1038 from 99designs/feat-check-len

check slice length
99designs · Feb 18, 2020 · bc07188 · bc07188
2 parents 07a1386 + 2c3853c
commit bc07188
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/internal/rewrite/rewriter.go b/internal/rewrite/rewriter.go
@@ -26,6 +26,9 @@ func New(importPath string) (*Rewriter, error) {
 	if err != nil {
 		return nil, err
 	}
+	if len(pkgs) == 0 {
+		return nil, fmt.Errorf("package not found for importPath: %s", importPath)
+	}
 
 	return &Rewriter{
 		pkg:    pkgs[0],
@@ -70,11 +73,11 @@ func (r *Rewriter) GetMethodBody(structname string, methodname string) string {
 			if d.Name.Name != methodname {
 				continue
 			}
-			if d.Recv == nil || d.Recv.List == nil {
+			if d.Recv == nil || len(d.Recv.List) == 0 {
 				continue
 			}
 			recv := d.Recv.List[0].Type
-			if star, isStar := d.Recv.List[0].Type.(*ast.StarExpr); isStar {
+			if star, isStar := recv.(*ast.StarExpr); isStar {
 				recv = star.X
 			}
 			ident, ok := recv.(*ast.Ident)

diff --git a/internal/rewrite/rewriter_test.go b/internal/rewrite/rewriter_test.go
@@ -8,11 +8,12 @@ import (
 )
 
 func TestRewriter(t *testing.T) {
-	r, err := New("github.com/99designs/gqlgen/internal/rewrite/testdata")
-	require.NoError(t, err)
+	t.Run("default", func(t *testing.T) {
+		r, err := New("github.com/99designs/gqlgen/internal/rewrite/testdata")
+		require.NoError(t, err)
 
-	body := r.GetMethodBody("Foo", "Method")
-	require.Equal(t, `
+		body := r.GetMethodBody("Foo", "Method")
+		require.Equal(t, `
 	// leading comment
 
 	// field comment
@@ -21,16 +22,23 @@ func TestRewriter(t *testing.T) {
 	// trailing comment
 `, body)
 
-	imps := r.ExistingImports("testdata/example.go")
-	require.Len(t, imps, 2)
-	assert.Equal(t, []Import{
-		{
-			Alias:      "",
-			ImportPath: "fmt",
-		},
-		{
-			Alias:      "lol",
-			ImportPath: "bytes",
-		},
-	}, imps)
+		imps := r.ExistingImports("testdata/example.go")
+		require.Len(t, imps, 2)
+		assert.Equal(t, []Import{
+			{
+				Alias:      "",
+				ImportPath: "fmt",
+			},
+			{
+				Alias:      "lol",
+				ImportPath: "bytes",
+			},
+		}, imps)
+
+	})
+
+	t.Run("out of scope dir", func(t *testing.T) {
+		_, err := New("../../../out-of-gomod/package")
+		require.Error(t, err)
+	})
 }