Merge branch 'master' into feat-riscv64-support

.github/workflows/ci.yml

@@ -10,8 +10,10 @@ jobs:
       matrix:
         go-version:
           - stable
+          - 1.21.x
           - 1.20.x
           - 1.19.x
+          - 1.18.x
           - 1.17.x
           - 1.16.x
           - 1.15.x

bootstrap.go

@@ -1,4 +1,5 @@
-//+build ignore
+//go:build ignore
+// +build ignore
 
 package main
 

install_test.go

@@ -1,4 +1,5 @@
-//+build CI
+//go:build CI
+// +build CI
 
 package main
 

mage/import_test.go

@@ -285,6 +285,26 @@ func TestMageImportsOneLine(t *testing.T) {
 		t.Fatalf("expected: %q got: %q", expected, actual)
 	}
 }
+func TestMageImportsTrailing(t *testing.T) {
+	stdout := &bytes.Buffer{}
+	stderr := &bytes.Buffer{}
+	inv := Invocation{
+		Dir:    "./testdata/mageimport/trailing",
+		Stdout: stdout,
+		Stderr: stderr,
+		Args:   []string{"build"},
+	}
+
+	code := Invoke(inv)
+	if code != 0 {
+		t.Fatalf("expected to exit with code 0, but got %v, stderr:\n%s", code, stderr)
+	}
+	actual := stdout.String()
+	expected := "build\n"
+	if actual != expected {
+		t.Fatalf("expected: %q got: %q", expected, actual)
+	}
+}
 
 func TestMageImportsTaggedPackage(t *testing.T) {
 	stdout := &bytes.Buffer{}

mage/main_test.go

@@ -1739,14 +1739,14 @@ func TestGoModules(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer os.RemoveAll(dir)
-	err = ioutil.WriteFile(filepath.Join(dir, "magefile.go"), []byte(`//+build mage
+	// beware, mage builds in go versions older than 1.17 so both build tag formats need to be present
+	err = ioutil.WriteFile(filepath.Join(dir, "magefile.go"), []byte(`//go:build mage
+// +build mage
 
 package main
 
-import "golang.org/x/text/unicode/norm"
-
 func Test() {
-	print("unicode version: " + norm.Version)
+	print("nothing is imported here for >1.17 compatibility")
 }
 `), 0600)
 	if err != nil {

mage/template.go

@@ -3,7 +3,8 @@ package mage
 // this template uses the "data"
 
 // var only for tests
-var mageMainfileTplString = `// +build ignore
+var mageMainfileTplString = `//go:build ignore
+// +build ignore
 
 package main
 

mage/testdata/alias/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/args/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/compiled/custom.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 // Compiled package description.

mage/testdata/context/context.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/error.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/func.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/goos_magefiles/magefile_nonwindows.go

@@ -1,3 +1,4 @@
+//go:build mage && !windows
 // +build mage,!windows
 
 package main

mage/testdata/goos_magefiles/magefile_windows.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/invalid_alias/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/keep_flag/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/list/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 // This is a comment on the package which should get turned into output with the

mage/testdata/mageimport/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mageimport/oneline/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/mageimport/samenamespace/duptargets/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package sametarget

mage/testdata/mageimport/samenamespace/uniquetargets/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/mageimport/tagged/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mageimport/tagged/pkg/mage.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package pkg
 

mage/testdata/mageimport/trailing/magefile.go

@@ -0,0 +1,6 @@
+//go:build mage
+// +build mage
+
+package main
+
+import _ "github.com/magefile/mage/mage/testdata/mageimport/oneline/other" //mage:import

mage/testdata/mageimport/trailing/other/other.go

@@ -0,0 +1,7 @@
+package other
+
+import "fmt"
+
+func Build() {
+	fmt.Println("build")
+}

mage/testdata/main.go

@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

mage/testdata/mixed_lib_files/mage_helpers.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mixed_lib_files/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mixed_lib_files/subdir/magefile.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/mixed_main_files/mage_helpers.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/mixed_main_files/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/namespaces/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/no_default/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/onlyStdLib/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/panic.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

mage/testdata/setdir/setdir.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/setworkdir/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/signals/signals.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/transitiveDeps/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

mage/testdata/wrong_dep/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

parse/parse.go

@@ -38,7 +38,7 @@ type PkgInfo struct {
 	Imports     Imports
 }
 
-// Function represented a job function from a mage file
+// Function represents a job function from a mage file
 type Function struct {
 	PkgAlias   string
 	Package    string
@@ -456,19 +456,18 @@ func setImports(gocmd string, pi *PkgInfo) error {
 }
 
 func getImportPath(imp *ast.ImportSpec) (path, alias string, ok bool) {
-	if imp.Doc == nil || len(imp.Doc.List) == 9 {
-		return "", "", false
-	}
-	// import is always the last comment
-	s := imp.Doc.List[len(imp.Doc.List)-1].Text
-
-	// trim comment start and normalize for anyone who has spaces or not between
-	// "//"" and the text
-	vals := strings.Fields(strings.ToLower(s[2:]))
-	if len(vals) == 0 {
-		return "", "", false
-	}
-	if vals[0] != importTag {
+	leadingVals := getImportPathFromCommentGroup(imp.Doc)
+	trailingVals := getImportPathFromCommentGroup(imp.Comment)
+
+	var vals []string
+	if len(leadingVals) > 0 {
+		vals = leadingVals
+		if len(trailingVals) > 0 {
+			log.Println("warning:", importTag, "specified both before and after, picking first")
+		}
+	} else if len(trailingVals) > 0 {
+		vals = trailingVals
+	} else {
 		return "", "", false
 	}
 	path, ok = lit2string(imp.Path)
@@ -489,6 +488,25 @@ func getImportPath(imp *ast.ImportSpec) (path, alias string, ok bool) {
 	}
 }
 
+func getImportPathFromCommentGroup(comments *ast.CommentGroup) []string {
+	if comments == nil || len(comments.List) == 9 {
+		return nil
+	}
+	// import is always the last comment
+	s := comments.List[len(comments.List)-1].Text
+
+	// trim comment start and normalize for anyone who has spaces or not between
+	// "//"" and the text
+	vals := strings.Fields(strings.ToLower(s[2:]))
+	if len(vals) == 0 {
+		return nil
+	}
+	if vals[0] != importTag {
+		return nil
+	}
+	return vals
+}
+
 func isNamespace(t *doc.Type) bool {
 	if len(t.Decl.Specs) != 1 {
 		return false
@@ -653,7 +671,7 @@ func getFunction(exp ast.Expr, pi *PkgInfo) (*Function, error) {
 			for _, imp := range pi.Imports {
 				if firstname == imp.Name {
 					for _, f := range imp.Info.Funcs {
-						if funcname == f.Name {
+						if funcname == f.Name && f.Receiver == "" {
 							return f, nil
 						}
 					}

parse/testdata/alias.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/command.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/func.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main

parse/testdata/importself/magefile.go

@@ -1,4 +1,5 @@
-//+build mage
+//go:build mage
+// +build mage
 
 package main
 

parse/testdata/repeating_synopsis.go

@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main