From 39e1a8c5aa1c7e285f0c8be5e5d5bd0eb1fd5fb0 Mon Sep 17 00:00:00 2001
From: Shulhan <m.shulhan@gmail.com>
Date: Tue, 31 Dec 2024 07:10:05 +0700
Subject: [PATCH] godoc: fix missing (Added in Go) "x.xx" for function with
 type parameters

For HTML documentation using godoc, since the introduction of type
parameters, the new API for function with type parameters has not been
rendered recently (no 1.XX displayed on the right).

This changes fix it by checking for "[" first in the function name
before "(".

Change-Id: I9421e095bbce7ffe5f871441160d6cc87cc3f299
Reviewed-on: https://go-review.googlesource.com/c/tools/+/639475
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
---
 godoc/versions.go      |  2 +-
 godoc/versions_test.go | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/godoc/versions.go b/godoc/versions.go
index 849f4d6470c..5a4dec33ea1 100644
--- a/godoc/versions.go
+++ b/godoc/versions.go
@@ -189,7 +189,7 @@ func parseRow(s string) (vr versionedRow, ok bool) {
 	case strings.HasPrefix(rest, "func "):
 		vr.kind = "func"
 		rest = rest[len("func "):]
-		if i := strings.IndexByte(rest, '('); i != -1 {
+		if i := strings.IndexAny(rest, "[("); i != -1 {
 			vr.name = rest[:i]
 			return vr, true
 		}
diff --git a/godoc/versions_test.go b/godoc/versions_test.go
index 0c5ca50c774..a021616ba11 100644
--- a/godoc/versions_test.go
+++ b/godoc/versions_test.go
@@ -65,6 +65,27 @@ func TestParseVersionRow(t *testing.T) {
 				recv: "Encoding",
 			},
 		},
+		{
+			// Function with type parameters.
+			// Taken from "go/src/api/go1.21.txt".
+			row: "pkg cmp, func Compare[$0 Ordered]($0, $0) int #59488",
+			want: versionedRow{
+				pkg:  "cmp",
+				kind: "func",
+				name: "Compare",
+			},
+		},
+		{
+			// Function without type parameter but have "[" after
+			// "(" should have works as is.
+			// Taken from "go/src/api/go1.21.txt".
+			row: "pkg bytes, func ContainsFunc([]uint8, func(int32) bool) bool #54386",
+			want: versionedRow{
+				pkg:  "bytes",
+				kind: "func",
+				name: "ContainsFunc",
+			},
+		},
 	}
 
 	for i, tt := range tests {