Merge pull request gopherjs#1207 from gopherjs/gofumpt

gofumpt the repo

Author: flimzy

.github/workflows/lint.yaml

@@ -0,0 +1,25 @@
+name: golangci-lint
+on:
+  pull_request:
+permissions:
+  contents: read
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "1.18.10"
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.53.3
+          only-new-issues: true
+
+      - name: Check go.mod
+        run: |
+          go mod tidy && git diff --exit-code

.golangci.toml

@@ -0,0 +1,14 @@
+[run]
+timeout = "1m"
+
+[output]
+format = "colored-line-number"
+
+[linters]
+disable-all = true
+enable = [
+    "gofumpt",
+]
+
+[issues]
+exclude-use-default = false

build/build.go

@@ -730,7 +730,7 @@ func (s *Session) SourceMappingCallback(m *sourcemap.Map) func(generatedLine, ge
 
 // WriteCommandPackage writes the final JavaScript output file at pkgObj path.
 func (s *Session) WriteCommandPackage(archive *compiler.Archive, pkgObj string) error {
-	if err := os.MkdirAll(filepath.Dir(pkgObj), 0777); err != nil {
+	if err := os.MkdirAll(filepath.Dir(pkgObj), 0o777); err != nil {
 		return err
 	}
 	codeFile, err := os.Create(pkgObj)

build/cache/cache.go

@@ -95,7 +95,7 @@ func (bc *BuildCache) StoreArchive(a *compiler.Archive) {
 		return // Caching is disabled.
 	}
 	path := cachedPath(bc.archiveKey(a.ImportPath))
-	if err := os.MkdirAll(filepath.Dir(path), 0750); err != nil {
+	if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
 		log.Warningf("Failed to create build cache directory: %v", err)
 		return
 	}

build/embed.go

@@ -55,17 +55,21 @@ func embedFiles(pkg *PackageData, fset *token.FileSet, files []*ast.File) (*ast.
 				&ast.CallExpr{
 					Fun: em.Spec.Type,
 					Args: []ast.Expr{
-						&ast.Ident{Name: buildIdent(fs[0].Name),
-							NamePos: em.Spec.Names[0].NamePos},
+						&ast.Ident{
+							Name:    buildIdent(fs[0].Name),
+							NamePos: em.Spec.Names[0].NamePos,
+						},
 					},
-				}}
+				},
+			}
 		case goembed.EmbedBytes:
 			// value = []byte(data)
 			em.Spec.Values = []ast.Expr{
 				&ast.CallExpr{
 					Fun:  em.Spec.Type,
 					Args: []ast.Expr{ast.NewIdent(buildIdent(fs[0].Name))},
-				}}
+				},
+			}
 		case goembed.EmbedString:
 			// value = data
 			em.Spec.Values = []ast.Expr{ast.NewIdent(buildIdent(fs[0].Name))}
@@ -115,15 +119,15 @@ func embedFiles(pkg *PackageData, fset *token.FileSet, files []*ast.File) (*ast.
 							Elt: &ast.StructType{
 								Fields: &ast.FieldList{
 									List: []*ast.Field{
-										&ast.Field{
+										{
 											Names: []*ast.Ident{ast.NewIdent("name")},
 											Type:  ast.NewIdent("string"),
 										},
-										&ast.Field{
+										{
 											Names: []*ast.Ident{ast.NewIdent("data")},
 											Type:  ast.NewIdent("string"),
 										},
-										&ast.Field{
+										{
 											Names: []*ast.Ident{ast.NewIdent("hash")},
 											Type: &ast.ArrayType{
 												Len: &ast.BasicLit{Kind: token.INT, Value: "16"},

circle.yml

@@ -72,9 +72,6 @@ jobs:
     executor: gopherjs
     steps:
     - setup_and_install_gopherjs
-    - run:
-        name: Check gofmt
-        command: diff -u <(echo -n) <(gofmt -d .)
     - run:
         name: Check go vet
         command: |

compiler/compiler.go

@@ -21,8 +21,10 @@ import (
 	"golang.org/x/tools/go/gcexportdata"
 )
 
-var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}
-var reservedKeywords = make(map[string]bool)
+var (
+	sizes32          = &types.StdSizes{WordSize: 4, MaxAlign: 8}
+	reservedKeywords = make(map[string]bool)
+)
 
 func init() {
 	for _, keyword := range []string{"abstract", "arguments", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "eval", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typeof", "undefined", "var", "void", "volatile", "while", "with", "yield"} {

compiler/natives/src/embed/embed.go

@@ -7,7 +7,8 @@ func buildFS(list []struct {
 	name string
 	data string
 	hash [16]byte
-}) (f FS) {
+},
+) (f FS) {
 	n := len(list)
 	files := make([]file, n)
 	for i := 0; i < n; i++ {

compiler/natives/src/encoding/gob/gob_test.go

@@ -68,7 +68,7 @@ func TestEndToEnd(t *testing.T) {
 		// TODO: Fix this problem:
 		// 	TypeError: dst.$set is not a function
 		// 	    at typedmemmove (/github.com/gopherjs/gopherjs/reflect.go:487:3)
-		//Marr:     map[[2]string][2]*float64{arr1: floatArr1, arr2: floatArr2},
+		// Marr:     map[[2]string][2]*float64{arr1: floatArr1, arr2: floatArr2},
 		EmptyMap: make(map[string]int),
 		N:        &[3]float64{1.5, 2.5, 3.5},
 		Strs:     &[2]string{s1, s2},

compiler/natives/src/internal/reflectlite/all_test.go

@@ -4,8 +4,9 @@
 package reflectlite_test
 
 import (
-	. "internal/reflectlite"
 	"testing"
+
+	. "internal/reflectlite"
 )
 
 func TestTypes(t *testing.T) {