Merge pull request #1643 from xushiwei/ov

gop fmt .gox bugfix
goplus · Jan 19, 2024 · 4ea9247 · 4ea9247
2 parents d2f6661 + b639f99
commit 4ea9247
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/parser/_testdata/goxtest/bar.gox → parser/_testdata/goxtest1/bar.gox b/parser/_testdata/goxtest/bar.gox → parser/_testdata/goxtest1/bar.gox
diff --git a/parser/_testdata/goxtest/parser.expect → parser/_testdata/goxtest1/parser.expect b/parser/_testdata/goxtest/parser.expect → parser/_testdata/goxtest1/parser.expect
diff --git a/parser/_testdata/goxtest2/bar.gox b/parser/_testdata/goxtest2/bar.gox
@@ -0,0 +1,3 @@
+var (
+	x.App
+)
diff --git a/parser/_testdata/goxtest2/parser.expect b/parser/_testdata/goxtest2/parser.expect
@@ -0,0 +1,15 @@
+package main
+
+file bar.gox
+ast.GenDecl:
+  Tok: var
+  Specs:
+    ast.ValueSpec:
+      Type:
+        ast.SelectorExpr:
+          X:
+            ast.Ident:
+              Name: x
+          Sel:
+            ast.Ident:
+              Name: App
diff --git a/printer/gop_test.go b/printer/gop_test.go
@@ -19,7 +19,6 @@ package printer_test
 import (
 	"bytes"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -114,7 +113,7 @@ func testFrom(t *testing.T, fpath, sel string, mode int) {
 	if sel != "" && !strings.Contains(fpath, sel) {
 		return
 	}
-	src, err := ioutil.ReadFile(fpath)
+	src, err := os.ReadFile(fpath)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/printer/nodes.go b/printer/nodes.go
@@ -1705,7 +1705,9 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {
 		p.setComment(s.Doc)
 		p.identList(s.Names, doIndent) // always present
 		if s.Type != nil {
-			p.print(blank)
+			if len(s.Names) > 0 {
+				p.print(blank)
+			}
 			p.expr(s.Type)
 		}
 		if s.Values != nil {