fix some tests

Author: wxiaoguang

modules/markup/html.go

@@ -817,31 +817,31 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
 
 	next := node.NextSibling
 
-	_, exttrack := ctx.Metas["format"]
-	notNumericStyle := ctx.Metas["style"] != IssueNameStyleNumeric
-	foundNumeric, refNumeric := references.FindRenderizableReferenceNumeric(node.Data, exttrack && notNumericStyle)
-
 	for node != nil && node != next {
+		_, hasExtTrackFormat := ctx.Metas["format"]
+
+		// Repos with external issue trackers might still need to reference local PRs
+		// We need to concern with the first one that shows up in the text, whichever it is
+		isNumericStyle := ctx.Metas["style"] == "" || ctx.Metas["style"] == IssueNameStyleNumeric
+		foundNumeric, refNumeric := references.FindRenderizableReferenceNumeric(node.Data, hasExtTrackFormat && !isNumericStyle)
+
 		switch ctx.Metas["style"] {
-		case IssueNameStyleNumeric:
-			found = foundNumeric
-			ref = refNumeric
+		case "", IssueNameStyleNumeric:
+			found, ref = foundNumeric, refNumeric
 		case IssueNameStyleAlphanumeric:
 			found, ref = references.FindRenderizableReferenceAlphanumeric(node.Data)
 		case IssueNameStyleRegexp:
-			// TODO: Compile only once, at regexp definition time
-			pattern, err := regexp.Compile(ctx.Metas["regexp"])
-			if err == nil {
+			pattern, err := regexp.Compile(ctx.Metas["regexp"]) // TODO: Compile only once, at regexp definition time
+			if err != nil {
 				return
 			}
 			found, ref = references.FindRenderizableReferenceRegexp(node.Data, pattern)
 		}
 
 		// Repos with external issue trackers might still need to reference local PRs
 		// We need to concern with the first one that shows up in the text, whichever it is
-		if exttrack && notNumericStyle {
-			// If numeric (PR) was found and it was BEFORE the notNumeric
-			// pattern, use that
+		if hasExtTrackFormat && !isNumericStyle {
+			// If numeric (PR) was found, and it was BEFORE the non-numeric pattern, use that
 			if foundNumeric && refNumeric.RefLocation.Start < ref.RefLocation.Start {
 				found = foundNumeric
 				ref = refNumeric
@@ -853,7 +853,7 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
 
 		var link *html.Node
 		reftext := node.Data[ref.RefLocation.Start:ref.RefLocation.End]
-		if exttrack && !ref.IsPull {
+		if hasExtTrackFormat && !ref.IsPull {
 			ctx.Metas["index"] = ref.Issue
 
 			res, err := vars.Expand(ctx.Metas["format"], ctx.Metas)
@@ -886,7 +886,7 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
 
 		// Decorate action keywords if actionable
 		var keyword *html.Node
-		if references.IsXrefActionable(ref, exttrack) {
+		if references.IsXrefActionable(ref, hasExtTrackFormat) {
 			keyword = createKeyword(node.Data[ref.ActionLocation.Start:ref.ActionLocation.End])
 		} else {
 			keyword = &html.Node{

modules/markup/html_internal_test.go

@@ -211,8 +211,13 @@ func TestRender_IssueIndexPattern5(t *testing.T) {
 			links[i] = externalIssueLink("https://someurl.com/someUser/someRepo/", "ref-issue ref-external-issue", name)
 		}
 
+		metas := map[string]string{}
+		for k, v := range regexpMetas {
+			metas[k] = v
+		}
+		metas["regexp"] = pattern
 		expected := fmt.Sprintf(expectedFmt, links...)
-		testRenderIssueIndexPattern(t, s, expected, &RenderContext{Metas: regexpMetas})
+		testRenderIssueIndexPattern(t, s, expected, &RenderContext{Metas: metas})
 	}
 
 	test("abc ISSUE-123 def", "abc %s def",
@@ -242,7 +247,7 @@ func testRenderIssueIndexPattern(t *testing.T, input, expected string, ctx *Rend
 	var buf strings.Builder
 	err := postProcess(ctx, []processor{issueIndexPatternProcessor}, strings.NewReader(input), &buf)
 	assert.NoError(t, err)
-	assert.Equal(t, expected, buf.String())
+	assert.Equal(t, expected, buf.String(), "input=%q", input)
 }
 
 func TestRender_AutoLink(t *testing.T) {

modules/references/references.go

@@ -354,14 +354,14 @@ func FindRenderizableReferenceNumeric(content string, prOnly bool) (bool, *Rende
 // FindRenderizableReferenceRegexp returns the first regexp unvalidated references found in a string.
 func FindRenderizableReferenceRegexp(content string, pattern *regexp.Regexp) (bool, *RenderizableReference) {
 	match := pattern.FindStringSubmatchIndex(content)
-	if match == nil {
+	if len(match) < 4 {
 		return false, nil
 	}
 
 	action, location := findActionKeywords([]byte(content), match[2])
 
 	return true, &RenderizableReference{
-		Issue:          string(content[match[2]:match[3]]),
+		Issue:          content[match[2]:match[3]],
 		RefLocation:    &RefSpan{Start: match[0], End: match[1]},
 		Action:         action,
 		ActionLocation: location,