x/format: GopClass update imports

Author: visualfc

x/format/gopclass_test.go

@@ -37,6 +37,12 @@ func testClass(t *testing.T, name string, pkg string, class string, entry string
 func TestClassSpx(t *testing.T) {
 	testClass(t, "spx class", "github.com/goplus/spx", "Calf", "Main", `package main
 
+import (
+	"github.com/goplus/spx"
+	"fmt"
+	"log"
+)
+
 type Calf struct {
 	spx.Sprite
 	*Game
@@ -46,6 +52,9 @@ type Calf struct {
 func (this *Calf) Update() {
 	this.index++
 }
+func (this *Calf) Dump() {
+	log.Println(this.info)
+}
 func (this *Calf) Main() {
 	this.OnStart(func() {
 		this.Say("Hello Go+")
@@ -54,7 +63,11 @@ func (this *Calf) Main() {
 func (this *Calf) Classfname() string {
 	return "Calf"
 }
-`, `var (
+`, `import (
+	"log"
+)
+
+var (
 	index int
 	info  string
 )
@@ -63,8 +76,13 @@ func Update() {
 	index++
 }
 
+func Dump() {
+	log.println info
+}
+
 onStart func() {
 	say "Hello Go+"
 }
 `)
+
 }

x/format/gopstyle.go

@@ -249,6 +249,7 @@ func formatClass(file *ast.File, pkg string, class string, entry string) {
 	}
 	var fnEntry *ast.FuncDecl
 	var decls []ast.Decl
+	var imports []ast.Decl
 	var varSpecs []ast.Spec
 	for _, decl := range file.Decls {
 		switch v := decl.(type) {
@@ -265,7 +266,11 @@ func formatClass(file *ast.File, pkg string, class string, entry string) {
 				}
 			}
 		case *ast.GenDecl:
-			if v.Tok == token.TYPE {
+			switch v.Tok {
+			case token.IMPORT:
+				imports = append(imports, v)
+				continue
+			case token.TYPE:
 				if spec, ok := v.Specs[0].(*ast.TypeSpec); ok && spec.Name.Name == class {
 					if st, ok := spec.Type.(*ast.StructType); ok {
 						for _, fs := range st.Fields.List {
@@ -281,13 +286,15 @@ func formatClass(file *ast.File, pkg string, class string, entry string) {
 		}
 		decls = append(decls, decl)
 	}
+
+	file.Decls = imports
 	if len(varSpecs) != 0 {
-		decls = append([]ast.Decl{&ast.GenDecl{Tok: token.VAR, Specs: varSpecs}}, decls...)
+		file.Decls = append(file.Decls, &ast.GenDecl{Tok: token.VAR, Specs: varSpecs})
 	}
+	file.Decls = append(file.Decls, decls...)
 	if fnEntry != nil {
-		decls = append(decls, fnEntry)
+		file.Decls = append(file.Decls, fnEntry)
 	}
-	file.Decls = decls
 
 	for _, decl := range file.Decls {
 		switch v := decl.(type) {
@@ -321,7 +328,7 @@ func formatClass(file *ast.File, pkg string, class string, entry string) {
 		formatFuncDecl(ctx, fn)
 	}
 	for _, imp := range ctx.imports {
-		if imp.pkgPath == "fmt" && !imp.isUsed {
+		if !imp.isUsed {
 			if len(imp.decl.Specs) == 1 {
 				file.Decls = deleteDecl(file.Decls, imp.decl)
 			} else {