Merge pull request #22 from moznion/tweak_for_#21

Tweak for #21

Author: moznion

.gitignore

@@ -12,6 +12,7 @@
 /Godeps/
 
 /internal/test/*_gen.go
+/internal/test/**/*_gen.go
 /dist/
 
 /gonstructor

Makefile

@@ -15,9 +15,12 @@ build4test: clean
 gen4test: build4test
 	go generate $(PKGS)
 
-test: gen4test
+test: clean-test-gen gen4test
 	go test -v $(PKGS)
 
+clean-test-gen:
+	rm -f internal/test/*_gen.go internal/test/**/*_gen.go
+
 lint:
 lint:
 	golangci-lint run ./...

cmd/gonstructor/gonstructor.go

@@ -79,11 +79,9 @@ func main() {
 		log.Fatal(fmt.Errorf("[error] failed to parse a file: %w", err))
 	}
 
-	var (
-		alreadyOpenedWithTruncFilesSet = map[string]bool{}
-		fileHeaderGenerated            = false
-		rootStmt                       = g.NewRoot()
-	)
+	alreadyOpenedWithTruncFilesSet := map[string]bool{}
+	fileHeaderGenerated := false
+	rootStmt := g.NewRoot()
 	for i, typeName := range typeNames {
 		fields, err := constructor.CollectConstructorFieldsFromAST(typeName, astFiles)
 		if err != nil {
@@ -140,7 +138,8 @@ func main() {
 		if *withGetter {
 			rootStmt = rootStmt.AddStatements(internal.GenerateGetters(typeName, fields))
 		}
-		if i != len(typeNames)-1 {
+
+		if i != len(typeNames)-1 { // insert a newline *between* the generated type-code (i.e. don't append a trailing newline)
 			rootStmt = rootStmt.AddStatements(g.NewNewline())
 		}
 	}

internal/test/init_return_propagation/structure_with_init_bar_gen.go

@@ -56,3 +56,13 @@ func TestStructureBuilder(t *testing.T) {
 	assert.EqualValues(t, givenBuzString, gotBravo.buz)
 	assert.EqualValues(t, givenQuxInt, gotBravo.qux)
 }
+
+func TestStructureWhichNeedsImport1Instantiation(t *testing.T) {
+	s := NewStructureWhichNeedsImport1(nil)
+	assert.IsType(t, &StructureWhichNeedsImport1{}, s)
+}
+
+func TestStructureWhichNeedsImport2Instantiation(t *testing.T) {
+	s := NewStructureWhichNeedsImport2(nil)
+	assert.IsType(t, &StructureWhichNeedsImport2{}, s)
+}

internal/test/init_return_propagation/structure_with_init_buz_gen.go

@@ -0,0 +1,22 @@
+package multitypes
+
+import (
+	"io"
+	"net"
+)
+
+// NOTE:
+// This structure file is for checking whether the compilation passes for the generated file according to this.
+// ref: https://github.com/moznion/gonstructor/pull/21
+//
+// Until the above pull request, the generated code hadn't passed the compilation.
+
+//go:generate sh -c "$(cd ./\"$(git rev-parse --show-cdup)\" || exit; pwd)/dist/gonstructor_test --type=StructureWhichNeedsImport1 --type=StructureWhichNeedsImport2 --output structure_with_multiple_imports_gen.go --constructorTypes=allArgs,builder --withGetter"
+
+type StructureWhichNeedsImport1 struct {
+	foo net.Conn
+}
+
+type StructureWhichNeedsImport2 struct {
+	bar io.Reader
+}