handle trailing comments

Author: linkdata

internal/gitsemver/versioninfo.go

@@ -37,8 +37,10 @@ func findPackageName(repo, s string) (pkgName string, err error) {
 		if b, err = os.ReadFile(filepath.Join(repo, "go.mod")); /*#nosec G304*/ err == nil {
 			for _, s := range strings.Split(string(b), "\n") {
 				s = strings.TrimSpace(s)
-				if strings.HasPrefix(s, "module") {
-					pkgName = LastName(s)
+				fields := strings.Fields(s)
+				if len(fields) >= 2 && fields[0] == "module" {
+					pkgName = LastName(fields[1])
+					break
 				}
 			}
 		}

internal/gitsemver/versioninfo_test.go

@@ -1,6 +1,8 @@
 package gitsemver_test
 
 import (
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -27,6 +29,22 @@ func Test_VersionInfo_GoPackage(t *testing.T) {
 	}
 }
 
+func Test_VersionInfo_GoPackage_ModuleWithInlineComment(t *testing.T) {
+	repo := t.TempDir()
+	goMod := "module example.com/my_pkg // inline comment\n\ngo 1.25\n"
+	if err := os.WriteFile(filepath.Join(repo, "go.mod"), []byte(goMod), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	vi := &gitsemver.VersionInfo{Tag: "v1.2.3", Branch: "mybranch", Build: "456"}
+	txt, err := vi.GoPackage(repo, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !strings.Contains(txt, "package my_pkg") || !strings.Contains(txt, "const PkgName = \"my_pkg\"") {
+		t.Fatalf("unexpected generated package text: %s", txt)
+	}
+}
+
 func Test_VersionInfo_IncPatch(t *testing.T) {
 	vi := &gitsemver.VersionInfo{Tag: "v1.2", Tags: []gitsemver.GitTag{{Tag: "v1.2"}}}
 	if !vi.HasTag("v1.2") {